diff --git a/README.md b/README.md index 861bb4a..d4b8706 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,10 @@ cd filcnaplo flutter run ``` +### Contribution + +Az összes (ugyan azon verzióhoz tartozó) contribution meg fog jelenni a release-nél. Kérjük, írd le a Discord nevedet a Description-be, hogy adhassunk rangot. + ------- # Kudo diff --git a/filcnaplo/android/app/build.gradle b/filcnaplo/android/app/build.gradle index 46a259d..49825fb 100644 --- a/filcnaplo/android/app/build.gradle +++ b/filcnaplo/android/app/build.gradle @@ -44,7 +44,7 @@ android { } defaultConfig { - applicationId "hu.filc.naplo" + applicationId "hu.refilc.naplo" minSdkVersion 21 targetSdkVersion rootProject.ext.targetSdkVersion versionCode flutterVersionCode.toInteger() diff --git a/filcnaplo/android/app/src/debug/AndroidManifest.xml b/filcnaplo/android/app/src/debug/AndroidManifest.xml index 5888d0a..826ca84 100644 --- a/filcnaplo/android/app/src/debug/AndroidManifest.xml +++ b/filcnaplo/android/app/src/debug/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/filcnaplo/android/app/src/main/AndroidManifest.xml b/filcnaplo/android/app/src/main/AndroidManifest.xml index 297f8ff..b5359c4 100644 --- a/filcnaplo/android/app/src/main/AndroidManifest.xml +++ b/filcnaplo/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo"> + diff --git a/filcnaplo/assets/icons/ic_launcher_foreground.png b/filcnaplo/assets/icons/ic_launcher_foreground.png index c7b42c2..a6d9eab 100644 Binary files a/filcnaplo/assets/icons/ic_launcher_foreground.png and b/filcnaplo/assets/icons/ic_launcher_foreground.png differ diff --git a/filcnaplo/lib/models/config.dart b/filcnaplo/lib/models/config.dart index 08def23..510ce22 100644 --- a/filcnaplo/lib/models/config.dart +++ b/filcnaplo/lib/models/config.dart @@ -9,7 +9,7 @@ class Config { factory Config.fromJson(Map json) { return Config( - userAgent: json["user_agent"] ?? "hu.filc.naplo/\$0/\$1/\$2", + userAgent: json["user_agent"] ?? "hu.refilc.naplo/\$0/\$1/\$2", json: json, ); } diff --git a/filcnaplo/lib/ui/widgets/grade/grade_tile.dart b/filcnaplo/lib/ui/widgets/grade/grade_tile.dart index aa16b06..73c3674 100644 --- a/filcnaplo/lib/ui/widgets/grade/grade_tile.dart +++ b/filcnaplo/lib/ui/widgets/grade/grade_tile.dart @@ -311,7 +311,7 @@ Color gradeColor( switch (valueInt) { case 5: - return Color(0xff3d7bf4); + return settings.gradeColors[4]; case 4: return settings.gradeColors[3]; case 3: diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml index 7d11f77..3b0171a 100644 --- a/filcnaplo/pubspec.yaml +++ b/filcnaplo/pubspec.yaml @@ -146,9 +146,11 @@ flutter: weight: 700 style: italic -flutter_icons: +flutter_launcher_icons: image_path: assets/icons/ic_launcher.png android: true + adaptive_icon_background: "#3D7BF4" + adaptive_icon_foreground: assets/icons/ic_launcher_foreground.png ios: true remove_alpha_ios: true diff --git a/filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart b/filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart index 92902f4..c7cec4a 100755 --- a/filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart @@ -135,7 +135,7 @@ class NavigationScreenState extends State initPlatformState(); - HomeWidget.setAppGroupId('hu.filc.naplo.group'); + HomeWidget.setAppGroupId('hu.refilc.naplo.group'); _checkForWidgetLaunch(); HomeWidget.widgetClicked.listen(_launchedFromWidget); diff --git a/filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart b/filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart index c356833..965df38 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart @@ -44,7 +44,7 @@ Ha az adataiddal kapcsolatban bármilyen kérdésed van (törlés, módosítás, Az alkalmazás használatával jelzed, hogy ezt a tájékoztatót tudomásul vetted. -Utolsó módosítás: 2021. 09. 25. +Utolsó módosítás: 2023. 05. 28. """, onOpen: (link) => launch(link.url, customTabsOption: CustomTabsOption( diff --git a/filcnaplo_premium/android/database/DBManager.java b/filcnaplo_premium/android/database/DBManager.java index b32f5a7..996ed4f 100644 --- a/filcnaplo_premium/android/database/DBManager.java +++ b/filcnaplo_premium/android/database/DBManager.java @@ -1,4 +1,4 @@ -package hu.filc.naplo.database; +package hu.refilc.naplo.database; import android.content.ContentValues; import android.content.Context; @@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase; import java.sql.SQLException; -import hu.filc.naplo.database.SQLiteHelper; +import hu.refilc.naplo.database.SQLiteHelper; public class DBManager { private Context context; diff --git a/filcnaplo_premium/android/database/SQLiteHelper.java b/filcnaplo_premium/android/database/SQLiteHelper.java index 10a97ec..11b22fb 100644 --- a/filcnaplo_premium/android/database/SQLiteHelper.java +++ b/filcnaplo_premium/android/database/SQLiteHelper.java @@ -1,4 +1,4 @@ -package hu.filc.naplo.database; +package hu.refilc.naplo.database; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/filcnaplo_premium/android/local.properties b/filcnaplo_premium/android/local.properties deleted file mode 100644 index 6057eba..0000000 --- a/filcnaplo_premium/android/local.properties +++ /dev/null @@ -1,2 +0,0 @@ -sdk.dir=E:\\__asdks\\Android\\Sdk -flutter.sdk=E:\\__asdks\\flutter \ No newline at end of file diff --git a/filcnaplo_premium/android/utils/Utils.java b/filcnaplo_premium/android/utils/Utils.java index d137c4c..51f635b 100644 --- a/filcnaplo_premium/android/utils/Utils.java +++ b/filcnaplo_premium/android/utils/Utils.java @@ -1,4 +1,4 @@ -package hu.filc.naplo.utils; +package hu.refilc.naplo.utils; import android.content.Context; import android.net.ConnectivityManager; diff --git a/filcnaplo_premium/android/utils/Week.java b/filcnaplo_premium/android/utils/Week.java index fba471c..e823c18 100644 --- a/filcnaplo_premium/android/utils/Week.java +++ b/filcnaplo_premium/android/utils/Week.java @@ -1,4 +1,4 @@ -package hu.filc.naplo.utils; +package hu.refilc.naplo.utils; import java.time.DayOfWeek; import java.time.Duration; diff --git a/filcnaplo_premium/android/widget_timetable/WidgetTimetable.java b/filcnaplo_premium/android/widget_timetable/WidgetTimetable.java index e43783f..6336edf 100644 --- a/filcnaplo_premium/android/widget_timetable/WidgetTimetable.java +++ b/filcnaplo_premium/android/widget_timetable/WidgetTimetable.java @@ -1,4 +1,4 @@ -package hu.filc.naplo.widget_timetable; +package hu.refilc.naplo.widget_timetable; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; @@ -27,11 +27,11 @@ import java.util.Comparator; import java.util.List; import java.util.Locale; -import hu.filc.naplo.database.DBManager; -import hu.filc.naplo.MainActivity; -import hu.filc.naplo.R; +import hu.refilc.naplo.database.DBManager; +import hu.refilc.naplo.MainActivity; +import hu.refilc.naplo.R; -import hu.filc.naplo.utils.Week; +import hu.refilc.naplo.utils.Week; import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; diff --git a/filcnaplo_premium/android/widget_timetable/WidgetTimetableDataProvider.java b/filcnaplo_premium/android/widget_timetable/WidgetTimetableDataProvider.java index 14cbde5..147157a 100644 --- a/filcnaplo_premium/android/widget_timetable/WidgetTimetableDataProvider.java +++ b/filcnaplo_premium/android/widget_timetable/WidgetTimetableDataProvider.java @@ -1,4 +1,4 @@ -package hu.filc.naplo.widget_timetable; +package hu.refilc.naplo.widget_timetable; import android.appwidget.AppWidgetManager; import android.content.Context; @@ -20,8 +20,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import hu.filc.naplo.database.DBManager; -import hu.filc.naplo.R; +import hu.refilc.naplo.database.DBManager; +import hu.refilc.naplo.R; public class WidgetTimetableDataProvider implements RemoteViewsService.RemoteViewsFactory { diff --git a/filcnaplo_premium/android/widget_timetable/WidgetTimetableService.java b/filcnaplo_premium/android/widget_timetable/WidgetTimetableService.java index 547b13b..01a5f90 100644 --- a/filcnaplo_premium/android/widget_timetable/WidgetTimetableService.java +++ b/filcnaplo_premium/android/widget_timetable/WidgetTimetableService.java @@ -1,4 +1,4 @@ -package hu.filc.naplo.widget_timetable; +package hu.refilc.naplo.widget_timetable; import android.content.Intent; import android.os.Build;