Merge branch 'master' of https://github.com/refilc/naplo

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

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()

filcnaplo/android/app/src/debug/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.filc.naplo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.refilc.naplo">
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.VIBRATE" />

filcnaplo/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="hu.filc.naplo">
+    xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
     <application android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true">
         <activity android:exported="true" android:name=".MainActivity"

filcnaplo/android/app/src/main/java/hu/filc/naplo/MainActivity.java

@@ -1,4 +1,4 @@
-package hu.filc.naplo;
+package hu.refilc.naplo;
 
 import android.os.Bundle;
 

filcnaplo/android/app/src/profile/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.filc.naplo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.refilc.naplo">
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.VIBRATE" />

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,
     );
   }

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:

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
 

filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart

@@ -135,7 +135,7 @@ class NavigationScreenState extends State<NavigationScreen>
 
     initPlatformState();
 
-    HomeWidget.setAppGroupId('hu.filc.naplo.group');
+    HomeWidget.setAppGroupId('hu.refilc.naplo.group');
 
     _checkForWidgetLaunch();
     HomeWidget.widgetClicked.listen(_launchedFromWidget);

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(

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;

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;

filcnaplo_premium/android/local.properties

@@ -1,2 +0,0 @@
-sdk.dir=E:\\__asdks\\Android\\Sdk
-flutter.sdk=E:\\__asdks\\flutter

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;

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;

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;
 

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 {
 

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;