diff --git a/.gitignore b/.gitignore index eb2131f..0042435 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,29 @@ -filcnaplo/.flutter-plugins -filcnaplo/.flutter-plugins-dependencies -filcnaplo/pubspec.lock -filcnaplo/.dart_tool/ -filcnaplo/android/ -filcnaplo/ios/ -filcnaplo/windows/ -filcnaplo/linux/ -filcnaplo/macos/ -filcnaplo/build/ +refilc/.flutter-plugins +refilc/.flutter-plugins-dependencies +refilc/pubspec.lock +refilc/.dart_tool/ +refilc/android/ +refilc/ios/ +refilc/windows/ +refilc/linux/ +refilc/macos/ +refilc/build/ -filcnaplo_desktop_ui/.flutter-plugins -filcnaplo_desktop_ui/.flutter-plugins-dependencies -filcnaplo_desktop_ui/pubspec.lock -filcnaplo_desktop_ui/.dart_tool/ +refilc_desktop_ui/.flutter-plugins +refilc_desktop_ui/.flutter-plugins-dependencies +refilc_desktop_ui/pubspec.lock +refilc_desktop_ui/.dart_tool/ -filcnaplo_kreta_api/.flutter-plugins -filcnaplo_kreta_api/.flutter-plugins-dependencies -filcnaplo_kreta_api/pubspec.lock -filcnaplo_kreta_api/.dart_tool/ +refilc_kreta_api/.flutter-plugins +refilc_kreta_api/.flutter-plugins-dependencies +refilc_kreta_api/pubspec.lock +refilc_kreta_api/.dart_tool/ -filcnaplo_mobile_ui/.flutter-plugins -filcnaplo_mobile_ui/.flutter-plugins-dependencies -filcnaplo_mobile_ui/pubspec.lock -filcnaplo_mobile_ui/.dart_tool/ +refilc_mobile_ui/.flutter-plugins +refilc_mobile_ui/.flutter-plugins-dependencies +refilc_mobile_ui/pubspec.lock +refilc_mobile_ui/.dart_tool/ filcnaplo_premium/.flutter-plugins filcnaplo_premium/.flutter-plugins-dependencies @@ -35,5 +35,5 @@ filcnaplo_premium/.dart_tool/ .idea .gitmodules -filcnaplo/.DS_Store +refilc/.DS_Store .DS_Store diff --git a/README.md b/README.md index 80b6022..badf856 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Run `fix-pub.sh` ### Run the app ```sh -cd filcnaplo +cd refilc flutter run ``` diff --git a/filcnaplo/android/app/build.gradle b/filcnaplo/android/app/build.gradle deleted file mode 100644 index e1fddd7..0000000 --- a/filcnaplo/android/app/build.gradle +++ /dev/null @@ -1,110 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - throw new GradleException("Undefined VersionCode") -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - throw new GradleException("Undefined VersionName") -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file("key.properties") -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - lintOptions { - disable 'InvalidPackage' - disable "Instantiatable" - checkReleaseBuilds false - abortOnError false - } - - defaultConfig { - applicationId "hu.refilc.naplo" - minSdkVersion 21 - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - multiDexEnabled true - } - - compileOptions { - // Flag to enable support for the new language APIs - coreLibraryDesugaringEnabled true - // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - signingConfigs { - debug { - keyAlias "androiddebugkey" - keyPassword "Jelszo123" - storeFile file("C:/Users/kima/debugkeystore.jks") - storePassword "Jelszo123" - } - - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] - } - } - - buildTypes { - debug { - signingConfig signingConfigs.debug - } - - release { - signingConfig signingConfigs.release - shrinkResources false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - buildFeatures { - viewBinding true - } -} - -flutter { - source '../..' -} - -dependencies { - implementation 'com.android.support:multidex:2.0.1' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'joda-time:joda-time:2.9.4' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - implementation 'androidx.window:window:1.0.0' - implementation 'androidx.window:window-java:1.0.0' -} diff --git a/filcnaplo/android/app/proguard-rules.pro b/filcnaplo/android/app/proguard-rules.pro deleted file mode 100644 index 56fe627..0000000 --- a/filcnaplo/android/app/proguard-rules.pro +++ /dev/null @@ -1,5 +0,0 @@ --keep class io.flutter.plugin.editing.** { *; } --keep class androidx.lifecycle.DefaultLifecycleObserver --keep class com.pauldemarco.flutter_blue.** { *; } --keep class com.mr.flutter.plugin.filepicker.** { *; } --keep class com.shockwave.** \ No newline at end of file diff --git a/filcnaplo/android/app/src/debug/AndroidManifest.xml b/filcnaplo/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 826ca84..0000000 --- a/filcnaplo/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/filcnaplo/android/app/src/main/AndroidManifest.xml b/filcnaplo/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index ffb15bb..0000000 --- a/filcnaplo/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java deleted file mode 100644 index ff22fb7..0000000 --- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java +++ /dev/null @@ -1,7 +0,0 @@ -package hu.refilc.naplo; - -import io.flutter.embedding.android.FlutterActivity; - -public class MainActivity extends FlutterActivity { - -} diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java deleted file mode 100644 index b39409d..0000000 --- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java +++ /dev/null @@ -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 map) { - ContentValues con = new ContentValues(); - for(Map.Entry 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 map) { - ContentValues con = new ContentValues(); - for(Map.Entry 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); - } -} \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java deleted file mode 100644 index 5944408..0000000 --- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java +++ /dev/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); - } -} \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java deleted file mode 100644 index 30f2a62..0000000 --- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java +++ /dev/null @@ -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(); - } -} \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java deleted file mode 100644 index 9f62c3e..0000000 --- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java +++ /dev/null @@ -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(); - } -} \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java deleted file mode 100644 index b433ec7..0000000 --- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java +++ /dev/null @@ -1,392 +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 java.util.Map; -import java.util.HashMap; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -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 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 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 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 genJsonDays(Context context) { - List genDays = new ArrayList<>(); - Map dayMap = new HashMap<>(); - - DBManager dbManager = new DBManager(context.getApplicationContext()); - - try { - dbManager.open(); - Cursor ct = dbManager.fetchTimetable(); - - if (ct.getCount() == 0) { - return genDays; - } - - JSONObject fetchedTimetable = new JSONObject(ct.getString(0)); - String currentWeek = String.valueOf(Week.current().id()); - JSONArray week = fetchedTimetable.getJSONArray(currentWeek); - - // Organize lessons into dates - for (int i = 0; i < week.length(); i++) { - try { - JSONObject entry = week.getJSONObject(i); - String date = entry.getString("Datum"); - dayMap.computeIfAbsent(date, k -> new JSONArray()).put(entry); - } catch (JSONException e) { - e.printStackTrace(); - } - } - - genDays.addAll(dayMap.values()); - - // Sort the 'genDays' list of JSON based on the start time of the first entry - genDays.sort((day1, day2) -> { - try { - // Extract the start time of the first entry in each day's JSON - String startTime1 = day1.getJSONObject(0).getString("KezdetIdopont"); - String startTime2 = day2.getJSONObject(0).getString("KezdetIdopont"); - // Compare the start times and return the result for sorting - return startTime1.compareTo(startTime2); - } catch (JSONException e) { - e.printStackTrace(); - return 0; - } - }); - - } catch (Exception e) { - e.printStackTrace(); - } finally { - dbManager.close(); - } - - return genDays; - } - - - - 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 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) { - } -} \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java deleted file mode 100644 index 55eaa98..0000000 --- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java +++ /dev/null @@ -1,356 +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 day_subjects = new ArrayList<>(); - List 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 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() { - 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 { - String name = json.getString("Nev"); - name = name.substring(0, 1).toUpperCase() + name.substring(1); // Capitalize name - return new Lesson( - json.getJSONObject("Allapot").getString("Nev"), - !json.getString("Oraszam").equals("null") ? json.getString("Oraszam") : "+", - name, - 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; - } -} \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java deleted file mode 100644 index 1864174..0000000 --- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java +++ /dev/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); - } -} \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/android12splash.png deleted file mode 100644 index 42f64fb..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-hdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 314c878..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png deleted file mode 100644 index f180cf9..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png deleted file mode 100644 index 42f64fb..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_image.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_image.png deleted file mode 100644 index 77f4ef2..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_image.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-mdpi/android12splash.png deleted file mode 100644 index 65928ee..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-mdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png deleted file mode 100644 index aa13b85..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png b/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png deleted file mode 100644 index b6b25d1..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png deleted file mode 100644 index 65928ee..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-night-hdpi/android12splash.png deleted file mode 100644 index 42f64fb..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-night-hdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-night-mdpi/android12splash.png deleted file mode 100644 index 65928ee..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-night-mdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-night-xhdpi/android12splash.png deleted file mode 100644 index 8147fe6..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-night-xhdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png deleted file mode 100644 index 80a42fb..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png deleted file mode 100644 index 2148f7f..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml deleted file mode 100644 index 4545224..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml deleted file mode 100644 index a7f5dd6..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml deleted file mode 100644 index 93ad67e..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml deleted file mode 100644 index 865d06c..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml deleted file mode 100644 index a4f78de..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml deleted file mode 100644 index cc14f03..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml deleted file mode 100644 index 90b35d8..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml deleted file mode 100644 index 289cd49..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml deleted file mode 100644 index 6721d42..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml deleted file mode 100644 index 5ae60cf..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/background.png b/filcnaplo/android/app/src/main/res/drawable-v21/background.png deleted file mode 100644 index d90316e..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-v21/background.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml deleted file mode 100644 index 3cc4948..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-xhdpi/android12splash.png deleted file mode 100644 index 8147fe6..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xhdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml deleted file mode 100644 index 0def536..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml deleted file mode 100644 index f12f731..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml deleted file mode 100644 index ee09eea..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml deleted file mode 100644 index 030aaf2..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index a83f396..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png b/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png deleted file mode 100644 index 7c96a2f..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png deleted file mode 100644 index 8147fe6..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png b/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png deleted file mode 100644 index 7f61c65..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml deleted file mode 100644 index 80b52be..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml deleted file mode 100644 index f2d52b0..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml deleted file mode 100644 index a37fed6..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml deleted file mode 100644 index c41e2b5..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml deleted file mode 100644 index a4eab7e..0000000 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/android12splash.png deleted file mode 100644 index 80a42fb..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 1de7a46..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png deleted file mode 100644 index b8b19e7..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png deleted file mode 100644 index 80a42fb..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/android12splash.png deleted file mode 100644 index 2148f7f..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/android12splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index beeae31..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png deleted file mode 100644 index dd12562..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png deleted file mode 100644 index 2148f7f..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable/background.png b/filcnaplo/android/app/src/main/res/drawable/background.png deleted file mode 100644 index d90316e..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable/background.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml b/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml deleted file mode 100644 index b820ec8..0000000 --- a/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml b/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml deleted file mode 100644 index 84bb6fe..0000000 --- a/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_absences.png b/filcnaplo/android/app/src/main/res/drawable/ic_absences.png deleted file mode 100644 index 97d6a2d..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable/ic_absences.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_grades.png b/filcnaplo/android/app/src/main/res/drawable/ic_grades.png deleted file mode 100644 index 4528dd0..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable/ic_grades.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_home.png b/filcnaplo/android/app/src/main/res/drawable/ic_home.png deleted file mode 100644 index 1321435..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable/ic_home.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_messages.png b/filcnaplo/android/app/src/main/res/drawable/ic_messages.png deleted file mode 100644 index e6b5178..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable/ic_messages.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_notification.png b/filcnaplo/android/app/src/main/res/drawable/ic_notification.png deleted file mode 100644 index 67fd370..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable/ic_notification.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_timetable.png b/filcnaplo/android/app/src/main/res/drawable/ic_timetable.png deleted file mode 100644 index 71a4621..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable/ic_timetable.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable/launch_background.xml b/filcnaplo/android/app/src/main/res/drawable/launch_background.xml deleted file mode 100644 index 3cc4948..0000000 --- a/filcnaplo/android/app/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf b/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf deleted file mode 100644 index 6e079f6..0000000 Binary files a/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/ic_launcher-web.png b/filcnaplo/android/app/src/main/res/ic_launcher-web.png deleted file mode 100644 index 25ed396..0000000 Binary files a/filcnaplo/android/app/src/main/res/ic_launcher-web.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml b/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml deleted file mode 100644 index b12af8d..0000000 --- a/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/layout/timetable_item.xml b/filcnaplo/android/app/src/main/res/layout/timetable_item.xml deleted file mode 100644 index aa23af8..0000000 --- a/filcnaplo/android/app/src/main/res/layout/timetable_item.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml b/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml deleted file mode 100644 index 75496ef..0000000 --- a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -