fixed some of the widget bugs and removed assets
This commit is contained in:
@@ -1,119 +0,0 @@
|
||||
package hu.refilc.naplo.database;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
|
||||
import java.sql.SQLException;
|
||||
|
||||
import hu.refilc.naplo.database.SQLiteHelper;
|
||||
|
||||
public class DBManager {
|
||||
private Context context;
|
||||
private SQLiteDatabase database;
|
||||
private SQLiteHelper dbHelper;
|
||||
|
||||
public DBManager(Context c) {
|
||||
this.context = c;
|
||||
}
|
||||
|
||||
public DBManager open() throws SQLException {
|
||||
this.dbHelper = new SQLiteHelper(this.context);
|
||||
this.database = this.dbHelper.getWritableDatabase();
|
||||
return this;
|
||||
}
|
||||
|
||||
public void close() {
|
||||
this.dbHelper.close();
|
||||
}
|
||||
|
||||
public Cursor fetchWidget(int wid) {
|
||||
Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_WIDGETS, new String[]{SQLiteHelper._ID, SQLiteHelper.DAY_SEL}, SQLiteHelper._ID + " = " + wid, null, null, null, null);
|
||||
if (cursor != null) {
|
||||
cursor.moveToFirst();
|
||||
}
|
||||
return cursor;
|
||||
}
|
||||
|
||||
public Cursor fetchTimetable() {
|
||||
Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_USER_DATA, new String[]{SQLiteHelper.TIMETABLE}, null, null, null, null, null);
|
||||
if (cursor != null) {
|
||||
cursor.moveToFirst();
|
||||
}
|
||||
return cursor;
|
||||
}
|
||||
|
||||
public Cursor fetchLastUser() {
|
||||
Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LAST_ACCOUNT_ID}, null, null, null, null, null);
|
||||
if (cursor != null) {
|
||||
cursor.moveToFirst();
|
||||
}
|
||||
return cursor;
|
||||
}
|
||||
|
||||
public Cursor fetchTheme() {
|
||||
Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.THEME, SQLiteHelper.ACCENT_COLOR}, null, null, null, null, null);
|
||||
if (cursor != null) {
|
||||
cursor.moveToFirst();
|
||||
}
|
||||
return cursor;
|
||||
}
|
||||
|
||||
public Cursor fetchPremiumToken() {
|
||||
Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_TOKEN}, null, null, null, null, null);
|
||||
if (cursor != null) {
|
||||
cursor.moveToFirst();
|
||||
}
|
||||
return cursor;
|
||||
}
|
||||
|
||||
public Cursor fetchPremiumScopes() {
|
||||
Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_SCOPES}, null, null, null, null, null);
|
||||
if (cursor != null) {
|
||||
cursor.moveToFirst();
|
||||
}
|
||||
return cursor;
|
||||
}
|
||||
|
||||
public Cursor fetchLocale() {
|
||||
Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LOCALE}, null, null, null, null, null);
|
||||
if (cursor != null) {
|
||||
cursor.moveToFirst();
|
||||
}
|
||||
return cursor;
|
||||
}
|
||||
|
||||
public void deleteWidget(int _id) {
|
||||
this.database.delete(SQLiteHelper.TABLE_NAME_WIDGETS, "_id=" + _id, null);
|
||||
}
|
||||
|
||||
/*public void changeSettings(int _id, Map<String, String> map) {
|
||||
ContentValues con = new ContentValues();
|
||||
for(Map.Entry<String, String> e: map.entrySet()){
|
||||
con.put(e.getKey(), e.getValue());
|
||||
}
|
||||
this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, "_id = " + _id, null);
|
||||
}
|
||||
public void insertSettings(int _id, Map<String, String> map) {
|
||||
ContentValues con = new ContentValues();
|
||||
for(Map.Entry<String, String> e: map.entrySet()){
|
||||
con.put(e.getKey(), e.getValue());
|
||||
//Log.d("Settings added", e.getKey() + " - " + e.getValue());
|
||||
}
|
||||
this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
|
||||
}*/
|
||||
|
||||
public void insertSelDay(int _id, int day_sel) {
|
||||
ContentValues con = new ContentValues();
|
||||
con.put(SQLiteHelper._ID, _id);
|
||||
con.put(SQLiteHelper.DAY_SEL, day_sel);
|
||||
this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
|
||||
}
|
||||
|
||||
public int update(int _id, int day_sel) {
|
||||
ContentValues con = new ContentValues();
|
||||
con.put(SQLiteHelper.DAY_SEL, day_sel);
|
||||
return this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, SQLiteHelper._ID + " = " + _id, null);
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package hu.refilc.naplo.database;
|
||||
|
||||
import android.content.Context;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.database.sqlite.SQLiteOpenHelper;
|
||||
|
||||
public class SQLiteHelper extends SQLiteOpenHelper {
|
||||
private static final String CREATE_TABLE_WIDGET = " create table widgets ( _id INTEGER NOT NULL, day_sel INTEGER NOT NULL);";
|
||||
private static final String DB_NAME = "app.db";
|
||||
private static final int DB_VERSION = 1;
|
||||
public static final String _ID = "_id";
|
||||
public static final String DAY_SEL = "day_sel";
|
||||
public static final String TIMETABLE = "timetable";
|
||||
public static final String LAST_ACCOUNT_ID = "last_account_id";
|
||||
public static final String THEME = "theme";
|
||||
public static final String PREMIUM_TOKEN = "premium_token";
|
||||
public static final String PREMIUM_SCOPES = "premium_scopes";
|
||||
public static final String LOCALE = "language";
|
||||
public static final String ACCENT_COLOR = "accent_color";
|
||||
public static final String TABLE_NAME_WIDGETS = "widgets";
|
||||
public static final String TABLE_NAME_USER_DATA = "user_data";
|
||||
public static final String TABLE_NAME_SETTINGS = "settings";
|
||||
|
||||
public SQLiteHelper(Context context) {
|
||||
super(context, DB_NAME, null, 7);
|
||||
}
|
||||
|
||||
public void onCreate(SQLiteDatabase db) {
|
||||
db.execSQL(CREATE_TABLE_WIDGET);
|
||||
}
|
||||
|
||||
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
|
||||
db.execSQL("DROP TABLE IF EXISTS widgets");
|
||||
onCreate(db);
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package hu.refilc.naplo.utils;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.NetworkInfo;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
|
||||
public class Utils {
|
||||
public static boolean hasNetwork(Context context) {
|
||||
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
NetworkInfo netInfo = cm.getActiveNetworkInfo();
|
||||
if (netInfo != null && netInfo.isConnectedOrConnecting()) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static Date getWeekStartDate() {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
|
||||
calendar.add(Calendar.DATE, -1);
|
||||
}
|
||||
return calendar.getTime();
|
||||
}
|
||||
|
||||
public static Date getWeekEndDate() {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
|
||||
calendar.add(Calendar.DATE, 1);
|
||||
}
|
||||
calendar.add(Calendar.DATE, -1);
|
||||
return calendar.getTime();
|
||||
}
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
package hu.refilc.naplo.utils;
|
||||
|
||||
import java.time.DayOfWeek;
|
||||
import java.time.Duration;
|
||||
import java.time.LocalDate;
|
||||
|
||||
public class Week {
|
||||
private final LocalDate start;
|
||||
private final LocalDate end;
|
||||
|
||||
private Week(LocalDate start, LocalDate end) {
|
||||
this.start = start;
|
||||
this.end = end;
|
||||
}
|
||||
|
||||
public static Week current() {
|
||||
return fromDate(LocalDate.now());
|
||||
}
|
||||
|
||||
public static Week fromId(int id) {
|
||||
LocalDate _now = getYearStart().plusDays(id * 7L);
|
||||
return new Week(_now.minusDays(_now.getDayOfWeek().getValue() - 1), _now.plusDays(7 - _now.getDayOfWeek().getValue()));
|
||||
}
|
||||
|
||||
public static Week fromDate(LocalDate date) {
|
||||
|
||||
return new Week(date.minusDays(date.getDayOfWeek().getValue() - 1), date.plusDays(7 - date.getDayOfWeek().getValue()));
|
||||
}
|
||||
|
||||
public Week next() {
|
||||
return Week.fromDate(start.plusDays(8));
|
||||
}
|
||||
|
||||
public int id() {
|
||||
return (int) Math.ceil(Duration.between(getYearStart().atStartOfDay(), start.atStartOfDay()).toDays() / 7f);
|
||||
}
|
||||
|
||||
private static LocalDate getYearStart() {
|
||||
LocalDate now = LocalDate.now();
|
||||
LocalDate start = getYearStart(now.getYear());
|
||||
return start.isBefore(now) ? start : getYearStart(now.getYear() -1);
|
||||
}
|
||||
|
||||
private static LocalDate getYearStart(int year) {
|
||||
LocalDate time = LocalDate.of(year, 9, 1);
|
||||
if (time.getDayOfWeek() == DayOfWeek.SATURDAY)
|
||||
return time.plusDays(2);
|
||||
else if (time.getDayOfWeek() == DayOfWeek.SUNDAY)
|
||||
return time.plusDays(1);
|
||||
return time;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
Week week = (Week) o;
|
||||
return this.id() == week.id();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return id();
|
||||
}
|
||||
}
|
||||
@@ -1,397 +0,0 @@
|
||||
package hu.refilc.naplo.widget_timetable;
|
||||
|
||||
import android.app.PendingIntent;
|
||||
import android.appwidget.AppWidgetManager;
|
||||
import android.appwidget.AppWidgetProvider;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.database.Cursor;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.RemoteViews;
|
||||
import android.widget.Toast;
|
||||
|
||||
import org.joda.time.DateTime;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.time.DayOfWeek;
|
||||
import java.time.format.TextStyle;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import hu.refilc.naplo.database.DBManager;
|
||||
import hu.refilc.naplo.MainActivity;
|
||||
import hu.refilc.naplo.R;
|
||||
|
||||
import hu.refilc.naplo.utils.Week;
|
||||
|
||||
import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
|
||||
|
||||
import es.antonborri.home_widget.HomeWidgetBackgroundIntent;
|
||||
import es.antonborri.home_widget.HomeWidgetLaunchIntent;
|
||||
import es.antonborri.home_widget.HomeWidgetProvider;
|
||||
|
||||
public class WidgetTimetable extends HomeWidgetProvider {
|
||||
|
||||
private static final String ACTION_WIDGET_CLICK_NAV_LEFT = "list_widget.ACTION_WIDGET_CLICK_NAV_LEFT";
|
||||
private static final String ACTION_WIDGET_CLICK_NAV_RIGHT = "list_widget.ACTION_WIDGET_CLICK_NAV_RIGHT";
|
||||
private static final String ACTION_WIDGET_CLICK_NAV_TODAY = "list_widget.ACTION_WIDGET_CLICK_NAV_TODAY";
|
||||
private static final String ACTION_WIDGET_CLICK_NAV_REFRESH = "list_widget.ACTION_WIDGET_CLICK_NAV_REFRESH";
|
||||
private static final String ACTION_WIDGET_CLICK_BUY_PREMIUM = "list_widget.ACTION_WIDGET_CLICK_BUY_PREMIUM";
|
||||
|
||||
@Override
|
||||
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, SharedPreferences widgetData) {
|
||||
for (int i = 0; i < appWidgetIds.length; i++) {
|
||||
RemoteViews views = generateView(context, appWidgetIds[i]);
|
||||
|
||||
if(premiumEnabled(context) && userLoggedIn(context)) {
|
||||
int rday = selectDay(context, appWidgetIds[i], 0, true);
|
||||
views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
|
||||
}
|
||||
|
||||
pushUpdate(context, views, appWidgetIds[i]);
|
||||
}
|
||||
}
|
||||
|
||||
public static void pushUpdate(Context context, RemoteViews remoteViews, int appWidgetSingleId) {
|
||||
AppWidgetManager manager = AppWidgetManager.getInstance(context);
|
||||
|
||||
manager.updateAppWidget(appWidgetSingleId, remoteViews);
|
||||
manager.notifyAppWidgetViewDataChanged(appWidgetSingleId, R.id.widget_list);
|
||||
}
|
||||
|
||||
public static RemoteViews generateView(Context context, int appId) {
|
||||
Intent serviceIntent = new Intent(context, WidgetTimetableService.class);
|
||||
serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appId);
|
||||
serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
|
||||
|
||||
RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_timetable);
|
||||
|
||||
views.setViewVisibility(R.id.need_premium, View.GONE);
|
||||
views.setViewVisibility(R.id.need_login, View.GONE);
|
||||
views.setViewVisibility(R.id.tt_grid_cont, View.GONE);
|
||||
|
||||
if(!userLoggedIn(context)) {
|
||||
views.setViewVisibility(R.id.need_login, View.VISIBLE);
|
||||
views.setOnClickPendingIntent(R.id.open_login, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
|
||||
} else if(premiumEnabled(context)) {
|
||||
views.setViewVisibility(R.id.tt_grid_cont, View.VISIBLE);
|
||||
views.setOnClickPendingIntent(R.id.nav_to_left, makePending(context, ACTION_WIDGET_CLICK_NAV_LEFT, appId));
|
||||
views.setOnClickPendingIntent(R.id.nav_to_right, makePending(context, ACTION_WIDGET_CLICK_NAV_RIGHT, appId));
|
||||
views.setOnClickPendingIntent(R.id.nav_current, makePending(context, ACTION_WIDGET_CLICK_NAV_TODAY, appId));
|
||||
views.setOnClickPendingIntent(R.id.nav_refresh, makePending(context, ACTION_WIDGET_CLICK_NAV_REFRESH, appId));
|
||||
views.setRemoteAdapter(R.id.widget_list, serviceIntent);
|
||||
views.setEmptyView(R.id.widget_list, R.id.empty_view);
|
||||
} else {
|
||||
views.setViewVisibility(R.id.need_premium, View.VISIBLE);
|
||||
views.setOnClickPendingIntent(R.id.buy_premium, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
|
||||
}
|
||||
|
||||
return views;
|
||||
}
|
||||
|
||||
static PendingIntent makePending(Context context, String action, int appWidgetId) {
|
||||
Intent activebtnnext = new Intent(context, WidgetTimetable.class);
|
||||
activebtnnext.setAction(action);
|
||||
activebtnnext.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
|
||||
return PendingIntent.getBroadcast(context, appWidgetId, activebtnnext , PendingIntent.FLAG_IMMUTABLE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
super.onReceive(context, intent);
|
||||
|
||||
if(intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
|
||||
int appId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
|
||||
RemoteViews views = generateView(context, appId);
|
||||
|
||||
try {
|
||||
if(premiumEnabled(context) && userLoggedIn(context)) {
|
||||
if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_LEFT)) {
|
||||
int rday = selectDay(context, appId, -1, false);
|
||||
views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
|
||||
|
||||
pushUpdate(context, views, appId);
|
||||
} else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_RIGHT)) {
|
||||
int rday = selectDay(context, appId, 1, false);
|
||||
views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
|
||||
|
||||
pushUpdate(context, views, appId);
|
||||
} else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_TODAY)) {
|
||||
int rday = getToday(context);
|
||||
setSelectedDay(context, appId, rday);
|
||||
|
||||
views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
|
||||
|
||||
pushUpdate(context, views, appId);
|
||||
} else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_REFRESH)) {
|
||||
PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("timetable://refresh"));
|
||||
pendingIntent.send();
|
||||
} else if (intent.getAction().equals("android.appwidget.action.APPWIDGET_DELETED")) {
|
||||
DBManager dbManager = new DBManager(context.getApplicationContext());
|
||||
|
||||
try {
|
||||
dbManager.open();
|
||||
dbManager.deleteWidget(appId);
|
||||
dbManager.close();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(intent.getAction().equals(ACTION_WIDGET_CLICK_BUY_PREMIUM)) {
|
||||
PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("settings://premium"));
|
||||
pendingIntent.send();
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static String convertDayOfWeek(Context context, int rday) {
|
||||
|
||||
/*if(rday == -1) return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));
|
||||
|
||||
String dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));*/
|
||||
|
||||
String dayOfWeek = "Unknown";
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
Locale loc = getLocale(context);
|
||||
|
||||
if (rday == -1)
|
||||
return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, loc);
|
||||
|
||||
dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, loc);
|
||||
}
|
||||
|
||||
return dayOfWeek.substring(0, 1).toUpperCase() + dayOfWeek.substring(1).toLowerCase();
|
||||
}
|
||||
|
||||
public static void setSelectedDay(Context context, int wid, int day) {
|
||||
DBManager dbManager = new DBManager(context.getApplicationContext());
|
||||
|
||||
try {
|
||||
dbManager.open();
|
||||
dbManager.update(wid, day);
|
||||
dbManager.close();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public static int getToday(Context context) {
|
||||
int rday = new DateTime().getDayOfWeek() - 1;
|
||||
List<JSONArray> s = genJsonDays(context);
|
||||
|
||||
try {
|
||||
if(checkIsAfter(s, rday)) rday += 1;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return retDay(rday, s.size());
|
||||
}
|
||||
|
||||
public static int selectDay(Context context, int wid, int add, Boolean afterSubjects) {
|
||||
DBManager dbManager = new DBManager(context.getApplicationContext());
|
||||
|
||||
try {
|
||||
dbManager.open();
|
||||
Cursor cursor = dbManager.fetchWidget(wid);
|
||||
|
||||
List<JSONArray> s = genJsonDays(context);
|
||||
int retday = new DateTime().getDayOfWeek() - 1;
|
||||
|
||||
if(cursor.getCount() != 0) retday = retDay(cursor.getInt(1) + add, s.size());
|
||||
|
||||
if(afterSubjects) if(checkIsAfter(s, retday)) retday += 1;
|
||||
retday = retDay(retday, s.size());
|
||||
|
||||
if(cursor.getCount() == 0) dbManager.insertSelDay(wid, retday);
|
||||
else dbManager.update(wid, retday);
|
||||
|
||||
dbManager.close();
|
||||
|
||||
return retday;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static Boolean checkIsAfter(List<JSONArray> s, int retday) throws Exception {
|
||||
retday = retDay(retday, s.size());
|
||||
|
||||
String vegIdopont = s.get(retday).getJSONObject(s.get(retday).length() - 1).getString("VegIdopont");
|
||||
|
||||
return new DateTime().isAfter(new DateTime(vegIdopont));
|
||||
}
|
||||
|
||||
public static int retDay(int retday, int size) {
|
||||
if (retday < 0) retday = size - 1;
|
||||
else if (retday > size - 1) retday = 0;
|
||||
|
||||
return retday;
|
||||
}
|
||||
|
||||
public static List<JSONArray> genJsonDays(Context context) {
|
||||
List<JSONArray> gen_days = new ArrayList<>();
|
||||
|
||||
DBManager dbManager = new DBManager(context.getApplicationContext());
|
||||
try {
|
||||
dbManager.open();
|
||||
Cursor ct = dbManager.fetchTimetable();
|
||||
dbManager.close();
|
||||
|
||||
if(ct.getCount() == 0) {
|
||||
return gen_days;
|
||||
}
|
||||
|
||||
JSONObject fecthtt = new JSONObject(ct.getString(0));
|
||||
|
||||
JSONArray dayArray = new JSONArray();
|
||||
String currday = "";
|
||||
|
||||
String currweek = String.valueOf(Week.current().id());
|
||||
|
||||
JSONArray week = fecthtt.getJSONArray(currweek);
|
||||
|
||||
for (int i=0; i < week.length(); i++)
|
||||
{
|
||||
try {
|
||||
if(i == 0) currday = week.getJSONObject(0).getString("Datum");
|
||||
JSONObject oraObj = week.getJSONObject(i);
|
||||
|
||||
if(!currday.equals(oraObj.getString("Datum"))) {
|
||||
gen_days.add(dayArray);
|
||||
currday = week.getJSONObject(i).getString("Datum");
|
||||
dayArray = new JSONArray();
|
||||
}
|
||||
|
||||
dayArray.put(oraObj);
|
||||
if(i == week.length() - 1) {
|
||||
gen_days.add(dayArray);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
Collections.sort(gen_days, new Comparator<JSONArray>() {
|
||||
|
||||
public int compare(JSONArray a, JSONArray b) {
|
||||
long valA = 0;
|
||||
long valB = 0;
|
||||
|
||||
try {
|
||||
valA = (long) new DateTime( a.getJSONObject(0).getString("Datum")).getMillis();
|
||||
valB = (long) new DateTime( b.getJSONObject(0).getString("Datum")).getMillis();
|
||||
}
|
||||
catch (JSONException ignored) {
|
||||
}
|
||||
|
||||
return (int) (valA - valB);
|
||||
}
|
||||
});
|
||||
|
||||
return gen_days;
|
||||
}
|
||||
|
||||
public static String zeroPad(int value, int padding){
|
||||
StringBuilder b = new StringBuilder();
|
||||
b.append(value);
|
||||
while(b.length() < padding){
|
||||
b.insert(0,"0");
|
||||
}
|
||||
return b.toString();
|
||||
}
|
||||
|
||||
public static Locale getLocale(Context context) {
|
||||
DBManager dbManager = new DBManager(context.getApplicationContext());
|
||||
|
||||
try {
|
||||
dbManager.open();
|
||||
String loc = dbManager.fetchLocale().getString(0);
|
||||
dbManager.close();
|
||||
|
||||
if(loc.equals("hu") || loc.equals("de")) {
|
||||
return new Locale(loc, loc.toUpperCase());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return new Locale("en", "GB");
|
||||
}
|
||||
|
||||
public static boolean premiumEnabled(Context context) {
|
||||
DBManager dbManager = new DBManager(context.getApplicationContext());
|
||||
|
||||
try {
|
||||
dbManager.open();
|
||||
String premium_token = dbManager.fetchPremiumToken().getString(0);
|
||||
String premium_scopes_raw = dbManager.fetchPremiumScopes().getString(0);
|
||||
dbManager.close();
|
||||
|
||||
JSONArray arr = new JSONArray(premium_scopes_raw);
|
||||
List<String> premium_scopes = new ArrayList<>();
|
||||
for(int i = 0; i < arr.length(); i++){
|
||||
String scope = arr.getString(i);
|
||||
premium_scopes.add(scope.substring(scope.lastIndexOf('.') + 1));
|
||||
}
|
||||
|
||||
if(!premium_token.equals("") && (premium_scopes.contains("*") || premium_scopes.contains("TIMETALBE_WIDGET"))) {
|
||||
return true;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean userLoggedIn(Context context) {
|
||||
return !lastUserId(context).equals("");
|
||||
}
|
||||
|
||||
public static String lastUserId(Context context) {
|
||||
DBManager dbManager = new DBManager(context.getApplicationContext());
|
||||
try {
|
||||
dbManager.open();
|
||||
Cursor cursor = dbManager.fetchLastUser();
|
||||
dbManager.close();
|
||||
|
||||
if(cursor != null && !cursor.getString(0).equals("")) {
|
||||
String last_user = cursor.getString(0);
|
||||
return last_user;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnabled(Context context) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisabled(Context context) {
|
||||
}
|
||||
}
|
||||
@@ -1,354 +0,0 @@
|
||||
package hu.refilc.naplo.widget_timetable;
|
||||
|
||||
import android.appwidget.AppWidgetManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.database.Cursor;
|
||||
import android.os.Build;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.RemoteViews;
|
||||
import android.widget.RemoteViewsService;
|
||||
|
||||
import org.joda.time.DateTime;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import hu.refilc.naplo.database.DBManager;
|
||||
import hu.refilc.naplo.R;
|
||||
|
||||
public class WidgetTimetableDataProvider implements RemoteViewsService.RemoteViewsFactory {
|
||||
|
||||
private Context context;
|
||||
private int appWidgetId;
|
||||
|
||||
private int rday = 0;
|
||||
|
||||
private int theme;
|
||||
|
||||
private Integer[] colorValues;
|
||||
|
||||
List<Lesson> day_subjects = new ArrayList<>();
|
||||
List<Integer> lessonIndexes = new ArrayList<>();
|
||||
|
||||
Item witem;
|
||||
|
||||
/* Default values */
|
||||
|
||||
static class Item {
|
||||
int Layout;
|
||||
|
||||
int NumVisibility;
|
||||
int NameVisibility;
|
||||
int NameNodescVisibility;
|
||||
int DescVisibility;
|
||||
int RoomVisibility;
|
||||
int TimeVisibility;
|
||||
|
||||
int NumColor;
|
||||
int NameColor;
|
||||
int NameNodescColor;
|
||||
int DescColor;
|
||||
|
||||
Integer[] NameNodescPadding = {0, 0, 0, 0};
|
||||
|
||||
public Item(int Layout, int NumVisibility,int NameVisibility,int NameNodescVisibility,int DescVisibility,int RoomVisibility,int TimeVisibility,int NumColor,int NameColor,int NameNodescColor,int DescColor) {
|
||||
this.Layout = Layout;
|
||||
this.NumVisibility = NumVisibility;
|
||||
this.NameVisibility = NameVisibility;
|
||||
this.NameNodescVisibility = NameNodescVisibility;
|
||||
this.DescVisibility = DescVisibility;
|
||||
this.RoomVisibility = RoomVisibility;
|
||||
this.TimeVisibility = TimeVisibility;
|
||||
|
||||
this.NumColor = NumColor;
|
||||
this.NameColor = NameColor;
|
||||
this.NameNodescColor = NameNodescColor;
|
||||
this.DescColor = DescColor;
|
||||
}
|
||||
}
|
||||
|
||||
static class Lesson {
|
||||
String status;
|
||||
String lessonIndex;
|
||||
String lessonName;
|
||||
String lessonTopic;
|
||||
String lessonRoom;
|
||||
long lessonStart;
|
||||
long lessonEnd;
|
||||
String substituteTeacher;
|
||||
|
||||
public Lesson(String status, String lessonIndex,String lessonName,String lessonTopic, String lessonRoom,long lessonStart,long lessonEnd,String substituteTeacher) {
|
||||
this.status = status;
|
||||
this.lessonIndex = lessonIndex;
|
||||
this.lessonName = lessonName;
|
||||
this.lessonTopic = lessonTopic;
|
||||
this.lessonRoom = lessonRoom;
|
||||
this.lessonStart = lessonStart;
|
||||
this.lessonEnd = lessonEnd;
|
||||
this.substituteTeacher = substituteTeacher;
|
||||
}
|
||||
}
|
||||
|
||||
Integer[] itemNameNodescPadding = {0, 0, 0, 0};
|
||||
|
||||
public WidgetTimetableDataProvider(Context context, Intent intent) {
|
||||
this.context = context;
|
||||
this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
|
||||
|
||||
this.theme = getThemeAccent(context);
|
||||
|
||||
this.colorValues = new Integer[]{R.color.filc,
|
||||
R.color.blue_shade300,
|
||||
R.color.green_shade300,
|
||||
R.color.lime_shade300,
|
||||
R.color.yellow_shade300,
|
||||
R.color.orange_shade300,
|
||||
R.color.red_shade300,
|
||||
R.color.pink_shade300,
|
||||
R.color.purple_shade300};
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
initData();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDataSetChanged() {
|
||||
initData();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCount() {
|
||||
|
||||
return day_subjects.size();
|
||||
}
|
||||
|
||||
public void setLayout(final RemoteViews view) {
|
||||
/* Visibilities */
|
||||
view.setViewVisibility(R.id.tt_item_num, witem.NumVisibility);
|
||||
view.setViewVisibility(R.id.tt_item_name, witem.NameVisibility);
|
||||
view.setViewVisibility(R.id.tt_item_name_nodesc, witem.NameNodescVisibility);
|
||||
view.setViewVisibility(R.id.tt_item_desc, witem.DescVisibility);
|
||||
view.setViewVisibility(R.id.tt_item_room, witem.RoomVisibility);
|
||||
view.setViewVisibility(R.id.tt_item_time, witem.TimeVisibility);
|
||||
|
||||
/* backgroundResources */
|
||||
view.setInt(R.id.main_lay, "setBackgroundResource", witem.Layout);
|
||||
|
||||
/* Paddings */
|
||||
view.setViewPadding(R.id.tt_item_name_nodesc, witem.NameNodescPadding[0], witem.NameNodescPadding[1], witem.NameNodescPadding[2], witem.NameNodescPadding[3]);
|
||||
|
||||
/* Text Colors */
|
||||
view.setInt(R.id.tt_item_num, "setTextColor", getColor(context, witem.NumColor));
|
||||
view.setInt(R.id.tt_item_name, "setTextColor", getColor(context, witem.NameColor));
|
||||
view.setInt(R.id.tt_item_name_nodesc, "setTextColor", getColor(context, witem.NameNodescColor));
|
||||
view.setInt(R.id.tt_item_desc, "setTextColor", getColor(context, witem.DescColor));
|
||||
}
|
||||
|
||||
public int getColor(Context context, int color) {
|
||||
return context.getResources().getColor(color);
|
||||
}
|
||||
|
||||
@Override
|
||||
public RemoteViews getViewAt(int position) {
|
||||
RemoteViews view = new RemoteViews(context.getPackageName(), R.layout.timetable_item);
|
||||
|
||||
witem = defaultItem(theme);
|
||||
|
||||
Lesson curr_subject = day_subjects.get(position);
|
||||
|
||||
if (curr_subject.status.equals("empty")) {
|
||||
witem.NumColor = R.color.text_miss_num;
|
||||
|
||||
witem.TimeVisibility = View.GONE;
|
||||
witem.RoomVisibility = View.GONE;
|
||||
|
||||
witem.NameNodescColor = R.color.text_miss;
|
||||
}
|
||||
|
||||
if (!curr_subject.substituteTeacher.equals("null")) {
|
||||
witem.NumColor = R.color.yellow;
|
||||
witem.Layout = R.drawable.card_layout_tile_helyetesitett;
|
||||
}
|
||||
|
||||
if (curr_subject.status.equals("Elmaradt")) {
|
||||
witem.NumColor = R.color.red;
|
||||
witem.Layout = R.drawable.card_layout_tile_elmarad;
|
||||
} else if (curr_subject.status.equals("TanevRendjeEsemeny")) {
|
||||
witem.NumVisibility = View.GONE;
|
||||
witem.TimeVisibility = View.GONE;
|
||||
witem.RoomVisibility = View.GONE;
|
||||
|
||||
witem.NameNodescPadding[0] = 50;
|
||||
witem.NameNodescPadding[2] = 50;
|
||||
|
||||
witem.NameNodescColor = R.color.text_miss;
|
||||
}
|
||||
|
||||
if (curr_subject.lessonTopic.equals("null")) {
|
||||
witem.DescVisibility = View.GONE;
|
||||
witem.NameVisibility = View.GONE;
|
||||
|
||||
witem.NameNodescVisibility = View.VISIBLE;
|
||||
}
|
||||
|
||||
setLayout(view);
|
||||
|
||||
String lessonIndexTrailing = curr_subject.lessonIndex.equals("+") ? "" : ".";
|
||||
|
||||
view.setTextViewText(R.id.tt_item_num, curr_subject.lessonIndex + lessonIndexTrailing);
|
||||
view.setTextViewText(R.id.tt_item_name, curr_subject.lessonName);
|
||||
view.setTextViewText(R.id.tt_item_name_nodesc, curr_subject.lessonName);
|
||||
view.setTextViewText(R.id.tt_item_desc, curr_subject.lessonTopic);
|
||||
view.setTextViewText(R.id.tt_item_room, curr_subject.lessonRoom);
|
||||
if(curr_subject.lessonStart != 0 && curr_subject.lessonEnd != 0)
|
||||
view.setTextViewText(R.id.tt_item_time, WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getMinuteOfHour(), 2) +
|
||||
"\n" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getMinuteOfHour(),2));
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RemoteViews getLoadingView() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getViewTypeCount() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getItemId(int position) {
|
||||
return position;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasStableIds() {
|
||||
return true;
|
||||
}
|
||||
|
||||
private void initData() {
|
||||
|
||||
theme = getThemeAccent(context);
|
||||
|
||||
rday = WidgetTimetable.selectDay(context, appWidgetId, 0, false);
|
||||
|
||||
day_subjects.clear();
|
||||
lessonIndexes.clear();
|
||||
|
||||
try {
|
||||
List<JSONArray> arr = WidgetTimetable.genJsonDays(context);
|
||||
|
||||
if(arr.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
JSONArray arr_lessons = WidgetTimetable.genJsonDays(context).get(rday);
|
||||
|
||||
for (int i = 0; i < arr_lessons.length(); i++) {
|
||||
JSONObject obj_lessons = arr_lessons.getJSONObject(i);
|
||||
|
||||
day_subjects.add(jsonToLesson(obj_lessons));
|
||||
}
|
||||
} catch (JSONException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
if(day_subjects.size() > 0) {
|
||||
Collections.sort(day_subjects, new Comparator<Lesson>() {
|
||||
public int compare(Lesson o1, Lesson o2) {
|
||||
return new DateTime(o1.lessonStart).compareTo(new DateTime(o2.lessonStart));
|
||||
}
|
||||
});
|
||||
|
||||
for (int i = 0; i < day_subjects.size(); i++) {
|
||||
if(!day_subjects.get(i).lessonIndex.equals("+")) {
|
||||
lessonIndexes.add(Integer.valueOf(day_subjects.get(i).lessonIndex));
|
||||
}
|
||||
}
|
||||
|
||||
if(lessonIndexes.size() > 0) {
|
||||
|
||||
int lessonsChecked = Collections.min(lessonIndexes);
|
||||
int i = 0;
|
||||
|
||||
while(lessonsChecked < Collections.max(lessonIndexes)) {
|
||||
if(!lessonIndexes.contains(lessonsChecked)) {
|
||||
day_subjects.add(i, emptyLesson(lessonsChecked));
|
||||
}
|
||||
lessonsChecked++;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static Integer getThemeAccent(Context context) {
|
||||
DBManager dbManager = new DBManager(context.getApplicationContext());
|
||||
|
||||
try {
|
||||
dbManager.open();
|
||||
Cursor cursor = dbManager.fetchTheme();
|
||||
dbManager.close();
|
||||
|
||||
return cursor.getInt(1);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public Item defaultItem(int theme) {
|
||||
return new Item(
|
||||
R.drawable.card_layout_tile,
|
||||
View.VISIBLE,
|
||||
View.VISIBLE,
|
||||
View.INVISIBLE,
|
||||
View.VISIBLE,
|
||||
View.VISIBLE,
|
||||
View.VISIBLE,
|
||||
colorValues[theme >= colorValues.length ? 0 : theme],
|
||||
R.color.text,
|
||||
R.color.text,
|
||||
R.color.text_desc
|
||||
);
|
||||
}
|
||||
|
||||
public Lesson emptyLesson(int lessonIndex) {
|
||||
return new Lesson("empty", String.valueOf(lessonIndex), "Lyukasóra", "null", "null", 0, 0, "null");
|
||||
}
|
||||
|
||||
public Lesson jsonToLesson(JSONObject json) {
|
||||
try {
|
||||
return new Lesson(
|
||||
json.getJSONObject("Allapot").getString("Nev"),
|
||||
!json.getString("Oraszam").equals("null") ? json.getString("Oraszam") : "+",
|
||||
json.getString("Nev"),
|
||||
json.getString("Tema"),
|
||||
json.getString("TeremNeve"),
|
||||
new DateTime(json.getString("KezdetIdopont")).getMillis(),
|
||||
new DateTime(json.getString("VegIdopont")).getMillis(),
|
||||
json.getString("HelyettesTanarNeve")
|
||||
);
|
||||
}catch (Exception e) {
|
||||
Log.d("Filc", "exception: " + e);
|
||||
};
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package hu.refilc.naplo.widget_timetable;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Build;
|
||||
import android.widget.RemoteViewsService;
|
||||
|
||||
public class WidgetTimetableService extends RemoteViewsService {
|
||||
@Override
|
||||
public RemoteViewsFactory onGetViewFactory(Intent intent) {
|
||||
return new WidgetTimetableDataProvider(getApplicationContext(), intent);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user