Skip to content

I
InstiApp
Commit c4a96b24 authored by Varun Patil's avatar Varun Patil
Browse files
Options

Remove redundant code

parent 15e0264a
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 177 deletions
app/src/main/java/app/insti/fragment/MapFragment.java
View file @ c4a96b24
......@@ -69,7 +69,6 @@ import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.mrane.campusmap.ExpandableListAdapter;
import com.mrane.campusmap.FuzzySearchAdapter;
import com.mrane.campusmap.IndexFragment;
import com.mrane.campusmap.ListFragment;
import com.mrane.campusmap.SettingsManager;
import com.mrane.data.Building;
......@@ -110,7 +109,6 @@ public class MapFragment extends Fragment implements TextWatcher,
private ExpandableListAdapter expAdapter;
private FragmentManager fragmentManager;
private ListFragment listFragment;
private IndexFragment indexFragment;
private Fragment fragment;
public LinearLayout newSmallCard;
public ImageView placeColor;
......@@ -320,7 +318,6 @@ public class MapFragment extends Fragment implements TextWatcher,
fragmentManager = getChildFragmentManager();
listFragment = new ListFragment();
indexFragment = new IndexFragment();
adapter.setSettingsManager(settingsManager);
......@@ -889,22 +886,6 @@ public class MapFragment extends Fragment implements TextWatcher,
campusMapView.invalidate();
}
public void removeClick(View v) {
this.editText.setText("");
displayMap();
}
public void indexClick(View v) {
this.putFragment(indexFragment);
this.removeEditTextFocus(null);
this.setCorrectIcons();
}
public void mapClick(View v) {
this.backToMap();
this.removeEditTextFocus("");
}
private void removeEditTextFocus(String text) {
if (this.editTextFocused) {
this.hideKeyboard();
......
app/src/main/java/com/mrane/campusmap/IndexFragment.java deleted 100644 → 0
View file @ 15e0264a
package com.mrane.campusmap;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ExpandableListView;
import android.widget.ExpandableListView.OnGroupClickListener;
import android.widget.ExpandableListView.OnGroupCollapseListener;
import android.widget.ExpandableListView.OnGroupExpandListener;
import com.mrane.data.Marker;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import app.insti.R;
import app.insti.fragment.MapFragment;
public class IndexFragment extends Fragment implements OnGroupExpandListener,
OnGroupCollapseListener, OnGroupClickListener {
MapFragment mainActivity;
ExpandableListAdapter adapter;
HashMap<String, Marker> data;
View rootView;
ExpandableListView list;
List<String> headers = new ArrayList<String>();
HashMap<String, List<String>> childData = new HashMap<String, List<String>>();
int pos;
int prevGroup = -1;
public IndexFragment() {
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mainActivity = MapFragment.getMainActivity();
data = mainActivity.data;
if (headers.isEmpty()) {
setHeaderAndChildData();
}
adapter = new ExpandableListAdapter(mainActivity.getContext(), headers, childData);
rootView = inflater.inflate(R.layout.map_index_fragment, container, false);
list = (ExpandableListView) rootView.findViewById(R.id.index_list);
mainActivity.setExpAdapter(adapter);
list.setAdapter(adapter);
list.setOnChildClickListener(mainActivity);
list.setOnGroupExpandListener(this);
list.setOnGroupCollapseListener(this);
list.setOnGroupClickListener(this);
return rootView;
}
@Override
public void onResume() {
String name = mainActivity.editText.getText().toString();
if(name.isEmpty()) {
collapseAllGroups();
list.setSelectedGroup(0);
} else {
if(data.containsKey(name)) {
String groupName = data.get(name).getGroupName();
int groupId = getGroupId(groupName);
if(groupId != -1) {
list.expandGroup(groupId);
list.setSelectedGroup(groupId);
}
}
}
super.onResume();
}
private int getGroupId(String groupName) {
int groupCount = adapter.getGroupCount();
int temp = -1;
for (int i=0; i < groupCount; i++) {
if(adapter.getGroup(i).equals(groupName)) {
temp = i;
}
}
return temp;
}
private void collapseAllGroups() {
int groupCount = adapter.getGroupCount();
for (int i=0; i < groupCount; i++) {
list.collapseGroup(i);
}
}
private void setChildData() {
Collection<Marker> keys = data.values();
for (Marker key : keys) {
List<String> child = childData.get(key.getGroupName());
child.add(key.getName());
}
sortChildData();
}
private void sortChildData() {
for (String header : headers) {
List<String> child = childData.get(header);
Collections.sort(child);
}
}
private void setHeaderAndChildData() {
String[] headerString = Marker.getGroupNames();
Collections.addAll(headers, headerString);
for (String header : headers) {
childData.put(header, new ArrayList<String>());
}
setChildData();
}
@Override
public void onGroupExpand(int groupPosition) {
if (prevGroup != -1 && prevGroup != groupPosition) {
list.collapseGroup(prevGroup);
}
prevGroup = groupPosition;
}
@Override
public void onGroupCollapse(int groupPosition) {
if (prevGroup != -1) {
//list.setSelectionFromTop(prevGroup, 0);
}
}
@Override
public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition,
long id) {
// Implement this method to scroll to the correct position as this doesn't
// happen automatically if we override onGroupExpand() as above
parent.smoothScrollToPosition(groupPosition);
// Need default behaviour here otherwise group does not get expanded/collapsed
// on click
if (parent.isGroupExpanded(groupPosition)) {
parent.collapseGroup(groupPosition);
} else {
parent.expandGroup(groupPosition);
}
return true;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment