Skip to content
Snippets Groups Projects
Commit 699efd93 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed scrollToLoad, added an input history

parent f8c63977
No related branches found
No related tags found
No related merge requests found
...@@ -47,4 +47,5 @@ dependencies { ...@@ -47,4 +47,5 @@ dependencies {
compile('com.mikepenz:fastadapter:0.4.2-SNAPSHOT@aar') { compile('com.mikepenz:fastadapter:0.4.2-SNAPSHOT@aar') {
transitive = true transitive = true
} }
compile 'com.sothree.slidinguppanel:library:3.2.1'
} }
...@@ -61,7 +61,7 @@ public class SimpleBacklogManager extends BacklogManager { ...@@ -61,7 +61,7 @@ public class SimpleBacklogManager extends BacklogManager {
(backlog.first() == null) ? -1 : (backlog.first() == null) ? -1 :
backlog.first().messageId; backlog.first().messageId;
requestBacklog(bufferId, -1, -1, count, 0); requestBacklog(bufferId, -1, messageId, count, 0);
} }
public ObservableList<Message> get(int bufferId) { public ObservableList<Message> get(int bufferId) {
......
...@@ -72,7 +72,10 @@ public class ChatMessageRenderer { ...@@ -72,7 +72,10 @@ public class ChatMessageRenderer {
} }
public void onBindNotice(MessageViewHolder holder, Message message) { public void onBindNotice(MessageViewHolder holder, Message message) {
holder.content.setText(message.toString()); holder.content.setText(strings.formatAction(
formatNick(message.sender, false),
helper.formatIrcMessage(message.content)
));
} }
public void onBindAction(MessageViewHolder holder, Message message) { public void onBindAction(MessageViewHolder holder, Message message) {
......
...@@ -21,10 +21,13 @@ import android.util.Log; ...@@ -21,10 +21,13 @@ import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ScrollView;
import android.widget.Toast; import android.widget.Toast;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.ICollapsible; import com.mikepenz.fastadapter.ICollapsible;
import com.mikepenz.fastadapter.adapters.ItemAdapter;
import com.mikepenz.materialdrawer.AccountHeader; import com.mikepenz.materialdrawer.AccountHeader;
import com.mikepenz.materialdrawer.AccountHeaderBuilder; import com.mikepenz.materialdrawer.AccountHeaderBuilder;
import com.mikepenz.materialdrawer.Drawer; import com.mikepenz.materialdrawer.Drawer;
...@@ -34,6 +37,7 @@ import com.mikepenz.materialdrawer.model.ProfileDrawerItem; ...@@ -34,6 +37,7 @@ import com.mikepenz.materialdrawer.model.ProfileDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IProfile; import com.mikepenz.materialdrawer.model.interfaces.IProfile;
import com.mikepenz.materialdrawer.util.KeyboardUtil; import com.mikepenz.materialdrawer.util.KeyboardUtil;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
...@@ -90,6 +94,12 @@ public class MainActivity extends AppCompatActivity { ...@@ -90,6 +94,12 @@ public class MainActivity extends AppCompatActivity {
@Bind(R.id.swipeview) @Bind(R.id.swipeview)
SwipeRefreshLayout swipeView; SwipeRefreshLayout swipeView;
@Bind(R.id.sliding_layout)
SlidingUpPanelLayout slidingLayout;
@Bind(R.id.msg_history)
RecyclerView msgHistory;
Drawer drawer; Drawer drawer;
AccountHeader header; AccountHeader header;
MessageAdapter adapter; MessageAdapter adapter;
...@@ -128,6 +138,8 @@ public class MainActivity extends AppCompatActivity { ...@@ -128,6 +138,8 @@ public class MainActivity extends AppCompatActivity {
private int bufferViewId; private int bufferViewId;
private BusProvider provider; private BusProvider provider;
private ItemAdapter<IDrawerItem> hackyHistoryAdapter = new ItemAdapter<>();
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -144,7 +156,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -144,7 +156,7 @@ public class MainActivity extends AppCompatActivity {
adapter = new MessageAdapter(this); adapter = new MessageAdapter(this);
// This fixes a horrible bug android has where opening the keyboard doesn’t resize the layout // This fixes a horrible bug android has where opening the keyboard doesn’t resize the layout
KeyboardUtil keyboardUtil = new KeyboardUtil(this, findViewById(R.id.layout)); KeyboardUtil keyboardUtil = new KeyboardUtil(this, slidingLayout);
keyboardUtil.enable(); keyboardUtil.enable();
startService(new Intent(this, QuasselService.class)); startService(new Intent(this, QuasselService.class));
...@@ -244,6 +256,12 @@ public class MainActivity extends AppCompatActivity { ...@@ -244,6 +256,12 @@ public class MainActivity extends AppCompatActivity {
return false; return false;
}); });
slidingLayout.setScrollableView(msgHistory);
FastAdapter<IDrawerItem> adapter = new FastAdapter<>();
hackyHistoryAdapter.wrap(adapter);
msgHistory.setAdapter(adapter);
msgHistory.setLayoutManager(new LinearLayoutManager(this));
} }
@Override @Override
...@@ -323,6 +341,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -323,6 +341,7 @@ public class MainActivity extends AppCompatActivity {
if (client != null) buffer = client.getBuffer(bufferId); if (client != null) buffer = client.getBuffer(bufferId);
String str = chatline.getText().toString(); String str = chatline.getText().toString();
hackyHistoryAdapter.add(new PrimaryDrawerItem().withName(str));
if (buffer != null && !str.isEmpty()) handler.getClient().sendInput(buffer.getInfo(), str); if (buffer != null && !str.isEmpty()) handler.getClient().sendInput(buffer.getInfo(), str);
chatline.setText(""); chatline.setText("");
} }
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <com.sothree.slidinguppanel.SlidingUpPanelLayout
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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/sliding_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
android:orientation="vertical"
app:umanoPanelHeight="?attr/actionBarSize"
app:umanoShadowHeight="4dp"
tools:context=".ui.MainActivity">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/layout"
tools:context=".ui.MainActivity"
android:orientation="vertical"> android:orientation="vertical">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
...@@ -23,5 +32,7 @@ ...@@ -23,5 +32,7 @@
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>
<include layout="@layout/content_main"/> <include layout="@layout/content_main"/>
</LinearLayout> </LinearLayout>
<include layout="@layout/slider_main" />
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:showIn="@layout/activity_main">
<android.support.v4.widget.SwipeRefreshLayout <android.support.v4.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swipeview" android:id="@+id/swipeview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/colorBackground"> android:background="?attr/colorBackground">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/messages" android:id="@+id/messages"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="?attr/dividerColor">
</View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="?attr/chatlineBackground"
android:elevation="5dp">
<EditText
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/chatline"
android:hint="Write a message..."
android:background="@android:color/transparent"
android:textSize="16sp"
android:padding="20dp"
android:inputType="textShortMessage|textCapSentences|textAutoCorrect"
android:imeOptions="actionSend" />
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/send"
android:layout_width="56dp"
android:padding="12dp"
style="?attr/buttonStyleSmall"
android:background="?attr/selectableItemBackgroundBorderless"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:tint="?attr/colorAccent"
android:src="@drawable/ic_send"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/chatlineBackground"
android:orientation="horizontal">
<EditText
android:id="@+id/chatline"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="Write a message..."
android:imeOptions="actionSend"
android:inputType="textShortMessage|textCapSentences|textAutoCorrect"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:textSize="16sp" />
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/send"
style="?attr/buttonStyleSmall"
android:layout_width="56dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:src="@drawable/ic_send"
android:tint="?attr/colorAccent" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/msg_history"
android:background="?attr/chatlineBackground"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1" />
</LinearLayout>
\ No newline at end of file
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:textAppearance="?android:attr/textAppearanceListItemSmall" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical" android:gravity="top"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:minHeight="?android:attr/listPreferredItemHeightSmall" > android:paddingTop="4dp"
android:paddingBottom="4dp" >
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/time" android:id="@+id/time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
...@@ -29,4 +29,7 @@ ...@@ -29,4 +29,7 @@
<string name="message_daychange">{ Day changed to %1$s }</string> <string name="message_daychange">{ Day changed to %1$s }</string>
<string name="message_action">* %1$s %2$s</string> <string name="message_action">* %1$s %2$s</string>
<string name="super_long_string">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat. Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo</string>
</resources> </resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment