sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete Canteens and Restore Canteen List to Default

Browse Source
This commit is contained in:
Sebastian Seedorf
2019-10-18 01:49:10 +02:00
parent f358bc1fe1
commit 4925943957
14 changed files with 352 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/de/sebse/fuplanner/MainActivity.java
View File

@@ -326,6 +326,9 @@ public class MainActivity extends AppCompatActivity
if (mFragmentPage == FRAGMENT_SCHEDULE) {
getMenuInflater().inflate(R.menu.options_schedule, menu);
return true;
} else if (mFragmentPage == FRAGMENT_CANTEENS) {
getMenuInflater().inflate(R.menu.options_canteens, menu);
return true;
}
return false;
}
@@ -337,7 +340,7 @@ public class MainActivity extends AppCompatActivity
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
//noinspection SimplifiableIfStatement
if (mFragmentPage == FRAGMENT_SCHEDULE) {
if (id == R.id.refresh) {
ScheduleFragment fragment = (ScheduleFragment) mFragmentManager.findFragmentByTag(String.valueOf(FRAGMENT_SCHEDULE));
if (fragment != null && fragment.isVisible()) {
@@ -351,6 +354,22 @@ public class MainActivity extends AppCompatActivity
}
return true;
}
} else if (mFragmentPage == FRAGMENT_CANTEENS) {
if (id == R.id.restore) {
CanteensFragment fragment = (CanteensFragment) mFragmentManager.findFragmentByTag(String.valueOf(FRAGMENT_CANTEENS));
if (fragment != null && fragment.isVisible()) {
fragment.restoreDefaults();
}
return true;
}
if (id == R.id.delete) {
CanteensFragment fragment = (CanteensFragment) mFragmentManager.findFragmentByTag(String.valueOf(FRAGMENT_CANTEENS));
if (fragment != null && fragment.isVisible()) {
fragment.startDelete();
}
return true;
}
}
return super.onOptionsItemSelected(item);
}

91
app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java
View File

@@ -7,12 +7,15 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import de.sebse.fuplanner.R;
import de.sebse.fuplanner.fragments.CanteensFragment.OnCanteensFragmentInteractionListener;
import de.sebse.fuplanner.services.canteen.types.Canteen;
import de.sebse.fuplanner.services.canteen.types.Canteens;
import de.sebse.fuplanner.tools.ui.CanteensViewHolder;
import de.sebse.fuplanner.tools.ui.CustomViewHolder;
import de.sebse.fuplanner.tools.ui.ItemViewHolder;
import de.sebse.fuplanner.tools.ui.StringViewHolder;
/**
@@ -21,8 +24,14 @@ import de.sebse.fuplanner.tools.ui.StringViewHolder;
*/
class CanteensAdapter extends RecyclerView.Adapter<CustomViewHolder> {
private static final int TYPE_NO_LIST_AVAILABLE = 0;
private static final int TYPE_DELETE_BUTTON = 1;
private static final int TYPE_ENTRY = 2;
private Canteens mValues;
private final OnCanteensFragmentInteractionListener mListener;
private boolean mIsShowDeletion = false;
private ArrayList<Integer> mDeleteCanteenIds = new ArrayList<>();
private DeletionListener mDeletionListener;
CanteensAdapter(OnCanteensFragmentInteractionListener listener) {
mValues = null;
@@ -37,27 +46,55 @@ class CanteensAdapter extends RecyclerView.Adapter<CustomViewHolder> {
@NonNull
@Override
public CustomViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
if (viewType == TYPE_NO_LIST_AVAILABLE) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_all_no_items, parent, false);
return new StringViewHolder(view);
} else if (viewType == TYPE_DELETE_BUTTON) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_canteens_btn_delete, parent, false);
return new StringViewHolder(view);
}
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_all_items, parent, false);
return new ItemViewHolder(view);
.inflate(R.layout.list_canteens_items, parent, false);
return new CanteensViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull CustomViewHolder holder, int position) {
if (holder instanceof StringViewHolder) {
int viewType = getItemViewType(position);
if (viewType == TYPE_NO_LIST_AVAILABLE) {
((StringViewHolder) holder).mString.setText(R.string.canteen_not_available);
} else if (holder instanceof ItemViewHolder) {
} else if (viewType == TYPE_DELETE_BUTTON) {
((StringViewHolder) holder).mString.setOnClickListener(v -> endDeletion());
} else {
if (mIsShowDeletion) {
position--;
}
if (mValues == null)
return;
Canteen canteen = mValues.get(holder.getAdapterPosition());
((ItemViewHolder) holder).mTitle.setText(canteen.getName());
((ItemViewHolder) holder).mSubLeft.setText(canteen.getAddress());
((ItemViewHolder) holder).mSubRight.setText(canteen.getCity());
Canteen canteen = mValues.get(position);
((CanteensViewHolder) holder).mTitle.setText(canteen.getName());
((CanteensViewHolder) holder).mSubLeft.setText(canteen.getAddress());
((CanteensViewHolder) holder).mSubRight.setText(canteen.getCity());
((CanteensViewHolder) holder).mRemoveIcon.setVisibility(mIsShowDeletion ? View.VISIBLE : View.GONE);
if (mDeleteCanteenIds.contains(canteen.getId())) {
((CanteensViewHolder) holder).mRemoveIcon.setImageDrawable(holder.mView.getResources().getDrawable(R.drawable.ic_remove_circle));
} else {
((CanteensViewHolder) holder).mRemoveIcon.setImageDrawable(holder.mView.getResources().getDrawable(R.drawable.ic_remove_circle_outline));
}
((CanteensViewHolder) holder).mRemoveIcon.setOnClickListener(v -> {
if (mDeleteCanteenIds.contains(canteen.getId())) {
// Prevent calling remove with index
//noinspection SuspiciousMethodCalls
mDeleteCanteenIds.remove((Object) canteen.getId());
} else {
mDeleteCanteenIds.add(canteen.getId());
}
notifyDataSetChanged();
});
holder.mView.setOnClickListener(v -> {
if (null != mListener) {
@@ -75,8 +112,40 @@ class CanteensAdapter extends RecyclerView.Adapter<CustomViewHolder> {
return 1;
}
if (mValues != null) {
return mValues.size();
return mIsShowDeletion ? mValues.size() + 1 : mValues.size();
}
return 0;
}
@Override
public int getItemViewType(int position) {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
return TYPE_NO_LIST_AVAILABLE;
}
return mIsShowDeletion && position == 0 ? TYPE_DELETE_BUTTON : TYPE_ENTRY;
}
public void startDeletion(DeletionListener listener) {
mDeletionListener = listener;
if (mValues.size() > 0) {
mDeleteCanteenIds.clear();
mIsShowDeletion = true;
notifyDataSetChanged();
}
}
public void endDeletion() {
int[] canteenIds = new int[mDeleteCanteenIds.size()];
for (int i = 0; i < mDeleteCanteenIds.size(); i++) {
canteenIds[i] = mDeleteCanteenIds.get(i);
}
mDeletionListener.onDeletionFinished(canteenIds);
mDeleteCanteenIds.clear();
mIsShowDeletion = false;
notifyDataSetChanged();
}
public interface DeletionListener {
void onDeletionFinished(int[] canteenIds);
}
}

44
app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java
View File

@@ -11,10 +11,16 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import de.sebse.fuplanner.MainActivity;
import de.sebse.fuplanner.R;
import de.sebse.fuplanner.services.canteen.CanteenBrowser;
import de.sebse.fuplanner.tools.MainActivityListener;
import de.sebse.fuplanner.tools.Preferences;
import de.sebse.fuplanner.tools.logging.Logger;
/**
@@ -104,6 +110,44 @@ public class CanteensFragment extends Fragment {
mMainActivityListener = null;
}
public void restoreDefaults() {
Preferences.setArrayInt(requireContext(), R.string.pref_canteen_selection, null);
this.refresh(true);
}
public void startDelete() {
log.d("start deletion");
adapter.startDeletion(items -> {
int[] canteens = Preferences.getArrayInt(requireContext(), R.string.pref_canteen_selection);
if (canteens != null) {
ArrayList<Integer> newList = new ArrayList<>();
for (int canteen : canteens) {
boolean found = false;
for (int item : items) {
if (item == canteen) {
found = true;
break;
}
}
if (!found) {
newList.add(canteen);
}
}
int[] newCants = new int[newList.size()];
for (int i = 0; i < newList.size(); i++)
newCants[i] = newList.get(i);
Preferences.setArrayInt(requireContext(), R.string.pref_canteen_selection, newCants);
}
this.refresh(true);
});
/*int[] canteens = Preferences.getArrayInt(requireContext(), R.string.pref_canteen_selection);
int[] newCants = new int[canteens.length - 1];
for (int i = 0; i < canteens.length - 1; i++)
newCants[i] = canteens[i];
Preferences.setArrayInt(requireContext(), R.string.pref_canteen_selection, newCants);
this.refresh(true);*/
}
public interface OnCanteensFragmentInteractionListener {
void onCanteensFragmentInteraction(int id);
}

25
app/src/main/java/de/sebse/fuplanner/services/canteen/CanteenBrowser.java
View File

@@ -8,12 +8,15 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.util.HashSet;
import de.sebse.fuplanner.R;
import de.sebse.fuplanner.services.canteen.types.Canteen;
import de.sebse.fuplanner.services.canteen.types.CanteenListener;
import de.sebse.fuplanner.services.canteen.types.Canteens;
import de.sebse.fuplanner.services.canteen.types.Day;
import de.sebse.fuplanner.tools.AsyncQueue;
import de.sebse.fuplanner.tools.Preferences;
import de.sebse.fuplanner.tools.network.HTTPService;
import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkError;
@@ -70,7 +73,22 @@ public class CanteenBrowser extends HTTPService {
callback.onResponse(new Canteens());
return;
}
get("https://openmensa.org/api/v2/canteens?near[lat]=52.449743&near[lng]=13.282245&near[dist]=7", null, response -> {
int[] visibleCanteens = Preferences.getArrayInt(context, R.string.pref_canteen_selection);
if (visibleCanteens == null) {
Preferences.setArrayInt(context, R.string.pref_canteen_selection, Canteens.availableCanteens);
visibleCanteens = Preferences.getArrayInt(context, R.string.pref_canteen_selection);
}
if (visibleCanteens == null || visibleCanteens.length == 0) {
callback.onResponse(new Canteens());
return;
}
StringBuilder ids = new StringBuilder();
ids.append(visibleCanteens[0]);
for (int i = 1; i < visibleCanteens.length; i++) ids.append(",").append(visibleCanteens[i]);
// "https://openmensa.org/api/v2/canteens?near[lat]=52.449743&near[lng]=13.282245&near[dist]=7"
get("https://openmensa.org/api/v2/canteens?ids=" + ids.toString(), null, response -> {
String body = response.getParsed();
if (body == null) {
errorCallback.onError(new NetworkError(201101, 403, "No canteen list retrieved!"));
@@ -93,12 +111,7 @@ public class CanteenBrowser extends HTTPService {
lat = coords.getDouble(0);
lng = coords.getDouble(1);
}
for (int cant : Canteens.availableCanteens) {
if (cant == id) {
canteens.addCanteen(id, name, city, address, lat, lng);
break;
}
}
}
} catch (JSONException e) {
e.printStackTrace();

34
app/src/main/java/de/sebse/fuplanner/tools/Preferences.java
View File

@@ -1,6 +1,7 @@
package de.sebse.fuplanner.tools;
import android.content.Context;
import android.content.SharedPreferences;
import androidx.annotation.ArrayRes;
import androidx.annotation.StringRes;
@@ -39,4 +40,37 @@ public class Preferences {
String string = context.getResources().getString(key);
PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(string, value).apply();
}
public static int[] getArrayInt(Context context, @StringRes int key) {
String string = context.getResources().getString(key);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if (!prefs.contains(string + "_size")) {
return null;
}
int size = prefs.getInt(string + "_size", 0);
int[] array = new int[size];
for (int i = 0; i < size; i++)
array[i] = prefs.getInt(string + "_" + i, 0);
return array;
}
public static void setArrayInt(Context context, @StringRes int key, int[] value) {
String string = context.getResources().getString(key);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
SharedPreferences.Editor editor = prefs.edit();
int oldSize = prefs.getInt(string + "_size", 0);
int newSize = 0;
if (value == null) {
editor.remove(string + "_size");
} else {
newSize = value.length;
editor.putInt(string +"_size", newSize);
}
for (int i = 0; i < newSize; i++)
editor.putInt(string + "_" + i, value[i]);
for (int i = newSize; i < oldSize; i++)
editor.remove(string + "_" + i);
editor.apply();
}
}

18
app/src/main/java/de/sebse/fuplanner/tools/ui/CanteensViewHolder.java Normal file
View File

@@ -0,0 +1,18 @@
package de.sebse.fuplanner.tools.ui;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import de.sebse.fuplanner.R;
public class CanteensViewHolder extends ItemViewHolder {
public final ImageView mRemoveIcon;
public CanteensViewHolder(View view) {
super(view);
mRemoveIcon = view.findViewById(R.id.remove_icon);
}
}

5
app/src/main/res/drawable/ic_remove_circle.xml Normal file
View File

@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="@color/colorFURed"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z"/>
</vector>

5
app/src/main/res/drawable/ic_remove_circle_outline.xml Normal file
View File

@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="@color/colorFURed"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
</vector>

19
app/src/main/res/layout/list_canteens_btn_delete.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/string"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/text_margin"
android:text="@string/delete_items"
android:textStyle="bold"
android:typeface="sans"
android:gravity="center"
android:textColor="@color/colorFUWhite"
android:background="@color/colorFURed"
/>
</LinearLayout>

70
app/src/main/res/layout/list_canteens_items.xml Normal file
View File

@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<ImageView
android:id="@+id/remove_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_remove_circle_outline"
android:contentDescription="TODO"
android:layout_gravity="center"
android:padding="8dp"/>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/cardview_margin"
card_view:cardElevation="@dimen/cardview_elevation">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/cardview_padding" >
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:typeface="sans"
tools:text="Test this new stuff!" />
<TextView
android:id="@+id/sub_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_marginTop="5dip"
android:textColor="#343434"
android:textSize="12sp"
tools:text="Peter Bauer" />
<TextView
android:id="@+id/sub_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@id/sub_left"
android:layout_alignBottom="@id/sub_left"
android:textColor="#343434"
android:textSize="12sp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
tools:text="20.03.18 18:42 Uhr" />
<TextView
android:id="@+id/top_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@id/title"
android:layout_alignBottom="@id/title"
android:textColor="#343434"
android:textSize="12sp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
tools:text="Room 105"
tools:ignore="RelativeOverlap" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>

12
app/src/main/res/menu/options_canteens.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/restore"
android:title="@string/restore"
app:showAsAction="never" />
<item
android:id="@+id/delete"
android:title="@string/delete_items"
app:showAsAction="never" />
</menu>

2
app/src/main/res/values-de/strings.xml
View File

@@ -115,4 +115,6 @@
<string name="network_error_parameter">Ein Netzwerkfehler ist aufgetreten: %s!</string>
<string name="rate_the_app">App bewerten!</string>
<string name="canteen_not_available">Die Kantinenliste ist für Android 4 und darunter nicht verfügbar!</string>
<string name="restore">Einträge zurücksetzen</string>
<string name="delete_items">Einträge löschen</string>
</resources>

17
app/src/main/res/values/preferences.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Select an item -->
<string-array name="pref_price_group" translatable="false">
<item>@string/pref_price_group</item>
<item>@string/pref_price_group_default</item>
@@ -7,16 +8,20 @@
<string name="pref_price_group" translatable="false">pref_price_group</string>
<string name="pref_price_group_default" translatable="false">all</string>
<string name="pref_last_visited_news" translatable="false">pref_last_visited_news</string>
<string name="pref_set_auto_sync_on_startup" translatable="false">pref_set_auto_sync_on_startup</string>
<string name="pref_shib_idp_session" translatable="false">pref_shib_idp_session</string>
<string-array name="pref_sync_frequency" translatable="false">
<item>@string/pref_sync_frequency</item>
<item>@string/pref_sync_frequency_default</item>
</string-array>
<string name="pref_sync_frequency" translatable="false">pref_sync_frequency</string>
<string name="pref_sync_frequency_default" translatable="false">6</string>
<!-- Other preferences -->
<string name="pref_last_visited_news" translatable="false">pref_last_visited_news</string>
<string name="pref_set_auto_sync_on_startup" translatable="false">pref_set_auto_sync_on_startup</string>
<string name="pref_shib_idp_session" translatable="false">pref_shib_idp_session</string>
<string name="pref_canteen_selection" translatable="false">pref_canteen_selection</string>
</resources>

2
app/src/main/res/values/strings.xml
View File

@@ -123,4 +123,6 @@
<string name="network_error_parameter">A network error occurred: %s!</string>
<string name="rate_the_app">Rate the App!</string>
<string name="canteen_not_available">The canteen list is not available for Android 4 and below!</string>
<string name="restore">Restore Defaults</string>
<string name="delete_items">Delete Items</string>
</resources>