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

Now saves the last opened chat list.

parent db280ae4
No related branches found
No related tags found
No related merge requests found
...@@ -338,6 +338,7 @@ public class MainActivity extends BoundActivity { ...@@ -338,6 +338,7 @@ public class MainActivity extends BoundActivity {
@Override @Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
chatListAdapter.selectConfig((int) id); chatListAdapter.selectConfig((int) id);
status.bufferViewConfigId = (int) id;
} }
@Override @Override
...@@ -347,7 +348,7 @@ public class MainActivity extends BoundActivity { ...@@ -347,7 +348,7 @@ public class MainActivity extends BoundActivity {
}); });
} }
updateBuffer(context.client().backlogManager().open()); updateBuffer(context.client().backlogManager().open());
// accountHeader.setActiveProfile(status.bufferViewConfigId, true); chatListSpinner.setSelection(chatListAdapter.indexOf(status.bufferViewConfigId));
} }
// FIXME: Fix this ugly hack // FIXME: Fix this ugly hack
......
...@@ -234,4 +234,12 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi ...@@ -234,4 +234,12 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi
else bufferViewHolderMap.remove(id); else bufferViewHolderMap.remove(id);
open = id; open = id;
} }
public int indexOf(int bufferViewConfigId) {
for (int i = 0; i < context.client().bufferViewManager().bufferViewConfigs().size(); i++) {
if (context.client().bufferViewManager().bufferViewConfigs().get(i).bufferViewId() == bufferViewConfigId)
return i;
}
return -1;
}
} }
...@@ -23,15 +23,13 @@ package de.kuschku.quasseldroid_ng.ui.theme; ...@@ -23,15 +23,13 @@ package de.kuschku.quasseldroid_ng.ui.theme;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import java.util.HashSet;
import java.util.Set;
import de.kuschku.libquassel.BusProvider; import de.kuschku.libquassel.BusProvider;
import de.kuschku.libquassel.client.Client; import de.kuschku.libquassel.client.Client;
import de.kuschku.libquassel.syncables.types.interfaces.QBufferViewConfig; import de.kuschku.libquassel.syncables.types.interfaces.QBufferViewConfig;
import de.kuschku.quasseldroid_ng.ui.settings.Settings; import de.kuschku.quasseldroid_ng.ui.settings.Settings;
import de.kuschku.util.irc.format.IrcFormatDeserializer; import de.kuschku.util.irc.format.IrcFormatDeserializer;
import de.kuschku.util.irc.format.IrcFormatSerializer; import de.kuschku.util.irc.format.IrcFormatSerializer;
import de.kuschku.util.observables.lists.ObservableSet;
public class AppContext { public class AppContext {
private ThemeUtil themeUtil; private ThemeUtil themeUtil;
...@@ -40,8 +38,7 @@ public class AppContext { ...@@ -40,8 +38,7 @@ public class AppContext {
private BusProvider provider; private BusProvider provider;
private IrcFormatDeserializer deserializer; private IrcFormatDeserializer deserializer;
private IrcFormatSerializer serializer; private IrcFormatSerializer serializer;
private QBufferViewConfig.DisplayType bufferDisplayType; private ObservableSet<QBufferViewConfig.DisplayType> bufferDisplayTypes = new ObservableSet<>();
private Set<QBufferViewConfig.DisplayType> bufferDisplayTypes = new HashSet<>();
public ThemeUtil themeUtil() { public ThemeUtil themeUtil() {
return themeUtil; return themeUtil;
...@@ -110,7 +107,7 @@ public class AppContext { ...@@ -110,7 +107,7 @@ public class AppContext {
return serializer; return serializer;
} }
public Set<QBufferViewConfig.DisplayType> bufferDisplayTypes() { public ObservableSet<QBufferViewConfig.DisplayType> bufferDisplayTypes() {
return bufferDisplayTypes; return bufferDisplayTypes;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment