diff --git a/refilc/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java b/refilc/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java index 29d817e..d6330fd 100644 --- a/refilc/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java +++ b/refilc/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java @@ -53,7 +53,7 @@ public class DBManager { } public Cursor fetchTheme() { - Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.THEME, SQLiteHelper.CUSTOM_ACCENT_COLOR, SQLiteHelper.CUSTOM_HIGHLIGHT_COLOR, SQLiteHelper.CUSTOM_BACKGROUND_COLOR}, null, null, null, null, null); + Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.THEME, SQLiteHelper.CUSTOM_ACCENT_COLOR, SQLiteHelper.CUSTOM_BACKGROUND_COLOR}, null, null, null, null, null); if (cursor != null) { cursor.moveToFirst(); } diff --git a/refilc/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java b/refilc/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java index 2bdc39b..b7c1e15 100644 --- a/refilc/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java +++ b/refilc/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java @@ -18,7 +18,6 @@ public class SQLiteHelper extends SQLiteOpenHelper { public static final String LOCALE = "language"; public static final String CUSTOM_ACCENT_COLOR = "custom_accent_color"; public static final String CUSTOM_BACKGROUND_COLOR = "custom_background_color"; - public static final String CUSTOM_HIGHLIGHT_COLOR = "custom_highlight_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"; diff --git a/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java b/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java index 29b0fa2..f474b7d 100644 --- a/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java +++ b/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java @@ -112,7 +112,7 @@ public class WidgetTimetable extends HomeWidgetProvider { dbManager.close(); int theme = cursor.getInt(0); - int customBackgroundColor = cursor.getInt(3); + int customBackgroundColor = cursor.getInt(2); return new Integer[]{theme, customBackgroundColor}; } catch (Exception e) { diff --git a/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java b/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java index 48ed3ec..1b34c8a 100644 --- a/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java +++ b/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java @@ -325,9 +325,9 @@ public class WidgetTimetableDataProvider implements RemoteViewsService.RemoteVie int theme = cursor.getInt(0); int customAccentColor = cursor.getInt(1); - int customHighlightColor = cursor.getInt(2); + int customBackgroundColor = cursor.getInt(2); - return new Integer[]{theme, customAccentColor, customHighlightColor}; + return new Integer[]{theme, customAccentColor, customBackgroundColor}; } catch (Exception e) { e.printStackTrace(); }