mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-28 16:51:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add widget for directly opening specific card"

Browse Source 
This is largely unneeded, as shortcuts are directly supported
now, and the widget was a hacky replacement for shortcuts.

This reverts commit ebe6139a64.
This commit is contained in:
Branden Archer
2017-11-25 00:13:55 -05:00
parent 23178d9694
commit 0df411ee96
7 changed files with 1 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
View File

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
import android.widget.CursorAdapter;
import android.widget.TextView;
public class LoyaltyCardCursorAdapter extends CursorAdapter
class LoyaltyCardCursorAdapter extends CursorAdapter
{
public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
{

130
app/src/main/java/protect/card_locker/appwidget/CardAppWidgetConfigure.java
View File

@@ -1,130 +0,0 @@
package protect.card_locker.appwidget;
import android.appwidget.AppWidgetManager;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ListView;
import protect.card_locker.DBHelper;
import protect.card_locker.LoyaltyCard;
import protect.card_locker.LoyaltyCardCursorAdapter;
import protect.card_locker.R;
/**
* The configuration screen for the CardAppWidgetProvider widget.
*/
public class CardAppWidgetConfigure extends AppCompatActivity
{
static final String TAG = "LoyaltyCardLocker";
private static final String PREFS_NAME
= "protect.card_locker.appwidget.CardAppWidgetProvider";
private static final String PREF_PREFIX_KEY = "prefix_";
int appWidgetId_ = AppWidgetManager.INVALID_APPWIDGET_ID;
@Override
public void onCreate(Bundle bundle)
{
super.onCreate(bundle);
// Set the result to CANCELED. This will cause the widget host to cancel
// out of the widget placement if they press the back button.
setResult(RESULT_CANCELED);
setContentView(R.layout.main_activity);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar.setVisibility(View.GONE);
setTitle(R.string.selectCardTitle);
// Find the widget id from the intent.
Intent intent = getIntent();
Bundle extras = intent.getExtras();
if (extras != null)
{
appWidgetId_ = extras.getInt(
AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
}
// If they gave us an intent without the widget id, just bail.
if (appWidgetId_ == AppWidgetManager.INVALID_APPWIDGET_ID)
{
finish();
}
final DBHelper db = new DBHelper(this);
// If there are no cards, bail
if(db.getLoyaltyCardCount() == 0)
{
finish();
}
final ListView cardList = (ListView) findViewById(R.id.list);
cardList.setVisibility(View.VISIBLE);
Cursor cardCursor = db.getLoyaltyCardCursor();
final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
cardList.setAdapter(adapter);
cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
{
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id)
{
Context context = CardAppWidgetConfigure.this;
Cursor selected = (Cursor) parent.getItemAtPosition(position);
LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
Log.d(TAG, "Saving card " + loyaltyCard.store + "," + loyaltyCard.id + " at " + appWidgetId_);
// Save the association of the card to the widget
saveIdPref(context, appWidgetId_, loyaltyCard.id);
// Push widget update to surface with newly set association
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
CardAppWidgetProvider.updateAppWidget(context, appWidgetManager, appWidgetId_);
// Make sure we pass back the original appWidgetId
Intent resultValue = new Intent();
resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId_);
setResult(RESULT_OK, resultValue);
finish();
}
});
}
// Write the prefix to the SharedPreferences object for this widget
static void saveIdPref(Context context, int appWidgetId, int id)
{
SharedPreferences.Editor prefs = context.getSharedPreferences(PREFS_NAME, 0).edit();
prefs.putInt(PREF_PREFIX_KEY + appWidgetId, id);
prefs.commit();
}
// Read the prefix from the SharedPreferences object for this widget.
// If there is no preference saved, get the default from a resource
static Integer loadIdPref(Context context, int appWidgetId)
{
SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, 0);
int id = prefs.getInt(PREF_PREFIX_KEY + appWidgetId, -1);
if(id >= 0)
{
return id;
}
else
{
return null;
}
}
}

79
app/src/main/java/protect/card_locker/appwidget/CardAppWidgetProvider.java
View File

@@ -1,79 +0,0 @@
package protect.card_locker.appwidget;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.widget.RemoteViews;
import protect.card_locker.DBHelper;
import protect.card_locker.LoyaltyCard;
import protect.card_locker.LoyaltyCardViewActivity;
import protect.card_locker.R;
public class CardAppWidgetProvider extends AppWidgetProvider
{
private static final String TAG = "LoyaltyCardLocker";
@Override
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds)
{
Log.d(TAG, "CardAppWidgetProvider onUpdate");
// For each widget that needs an update, get the text that we should display:
// - Create a RemoteViews object for it
// - Set the text in the RemoteViews object
// - Tell the AppWidgetManager to show that views object for the widget.
for (int appWidgetId : appWidgetIds)
{
updateAppWidget(context, appWidgetManager, appWidgetId);
}
}
static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId)
{
Log.d(TAG, "updateAppWidget appWidgetId=" + appWidgetId);
LoyaltyCard card = null;
DBHelper db = new DBHelper(context);
Integer id = CardAppWidgetConfigure.loadIdPref(context, appWidgetId);
if(id != null)
{
Log.d(TAG, "updateAppWidget Retrieved id " + id);
card = db.getLoyaltyCard(id);
}
if(card != null)
{
Log.d(TAG, "updateAppWidget Updating widget " + appWidgetId + " to load " + card.store);
// Construct the RemoteViews object. It takes the package name (in our case, it's our
// package, but it needs this because on the other side it's the widget host inflating
// the layout from our package).
RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.appwidget_provider);
views.setTextViewText(R.id.title, card.store);
// Launch the view activity when clicked
Intent intent = new Intent(context, LoyaltyCardViewActivity.class);
Bundle extras = new Bundle();
extras.putInt("id", id);
extras.putBoolean("view", true);
intent.putExtras(extras);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
views.setOnClickPendingIntent(R.id.widget, pendingIntent);
// Tell the widget manager
appWidgetManager.updateAppWidget(appWidgetId, views);
}
else
{
Log.d(TAG, "updateAppWidget, no card ID associated with widget " + appWidgetId
+ ", ignoring update");
}
}
}