diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_icon.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_icon.png new file mode 100644 index 0000000..bdb6771 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_icon.png 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 new file mode 100644 index 0000000..77f4ef2 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_image.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_widget.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_widget.png new file mode 100644 index 0000000..8374b1a Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_widget.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/tinta_icon.png b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/tinta_icon.png deleted file mode 100644 index 0d2ae80..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/tinta_icon.png and /dev/null differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/tinta_widget.png b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/tinta_widget.png deleted file mode 100644 index 51d270b..0000000 Binary files a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/tinta_widget.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 index cff6566..d91b3b2 100644 --- a/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml +++ b/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml @@ -10,7 +10,7 @@ <item> <shape android:shape="rectangle"> - <gradient android:endColor="#ffE0CCEC" android:startColor="#C9ABDC" /> + <gradient android:endColor="#ffE0CCEC" android:startColor="#ffC9ABDC" /> <corners android:radius="10dp" /> </shape> </item> 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 new file mode 100644 index 0000000..22c1d8f --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_pressed="true"> + <shape android:shape="rectangle"> + <solid android:color="#ff1D8868"></solid> + <corners android:radius="10dp" /> + </shape> + </item> + + <item> + <shape android:shape="rectangle"> + <gradient android:endColor="#ff1D8868" android:startColor="#ff1EA18F" /> + <corners android:radius="10dp" /> + </shape> + </item> + +</selector> \ 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 index 0babbc8..bc8be56 100644 --- a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml +++ b/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml @@ -97,28 +97,60 @@ </RelativeLayout> </RelativeLayout> - <LinearLayout + <RelativeLayout android:visibility="gone" android:id="@+id/need_login" android:layout_width="match_parent" android:layout_height="match_parent" - android:gravity="center" + android:backgroundTint="#ffF4F4F4" android:background="@drawable/card_layout_bg" - android:orientation="vertical"> + android:orientation="vertical" > + + <!--<ImageView + android:layout_width="45dp" + android:layout_height="45dp" + android:paddingHorizontal="10dp" + android:paddingTop="5dp" + android:src="@drawable/tinta_icon" />--> + + <ImageView + android:id="@+id/iv_1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:paddingHorizontal="10dp" + android:paddingTop="10dp" + android:src="@drawable/tinta_image" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_below="@id/iv_1" + android:layout_marginHorizontal="15dp" android:fontFamily="@font/montserrat_medium" - android:gravity="center" - android:text="A Widget használatához, bejelentkezés szükséges." - android:textColor="@color/green" - android:textSize="24sp" + android:text="A widget használatához, bejelentkezés szükséges." + android:textColor="@color/black" + android:paddingTop="10dp" + android:textSize="17dp" android:textStyle="bold" /> - </LinearLayout> + <Button + android:id="@+id/open_login" + android:layout_width="match_parent" + android:layout_height="40dp" + android:layout_alignParentBottom="true" + android:background="@drawable/btn_shape_login" + android:text="Alkalmazás megnyitása" + android:padding="0dp" + android:layout_margin="10dp" + android:textColor="@color/white" + android:fontFamily="@font/montserrat_medium" + android:textSize="16dp" + android:textStyle="bold"/> - <LinearLayout + </RelativeLayout> + + <RelativeLayout android:visibility="gone" android:id="@+id/need_premium" android:layout_width="match_parent" @@ -127,15 +159,45 @@ android:background="@drawable/card_layout_bg" android:orientation="vertical" > - <ImageView - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.5" - android:layout_centerHorizontal="true" - android:adjustViewBounds="true" + <!--<ImageView + android:layout_width="45dp" + android:layout_height="45dp" android:paddingHorizontal="10dp" android:paddingTop="5dp" - android:src="@drawable/tinta_widget" /> + android:src="@drawable/tinta_icon" />--> + + <ImageView + android:id="@+id/iv_2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:paddingHorizontal="10dp" + android:paddingTop="10dp" + android:src="@drawable/tinta_image" /> + + <TextView + android:id="@+id/tw_1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/iv_2" + android:layout_marginHorizontal="15dp" + android:fontFamily="@font/montserrat_medium" + android:text="Órák a kezdőképernyőd kényelméből." + android:textColor="@color/black" + android:paddingTop="10dp" + android:textSize="16dp" + android:textStyle="bold" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/tw_1" + android:fontFamily="@font/montserrat_medium" + android:text="Fizess elő a Tinta szinten és helyezz egy widgetet a kezdőképernyődre." + android:textColor="@color/black" + android:layout_marginTop="0dp" + android:layout_marginHorizontal="15dp" + android:textSize="14dp" /> <Button android:id="@+id/buy_premium" @@ -145,12 +207,13 @@ android:gravity="center" android:text="Vigyél oda!" android:padding="0dp" - android:layout_margin="0dp" + android:layout_alignParentBottom="true" + android:layout_margin="10dp" android:textColor="#ff691A9B" android:fontFamily="@font/montserrat_medium" android:textSize="16dp" android:textStyle="bold"/> - </LinearLayout> + </RelativeLayout> </RelativeLayout> \ No newline at end of file diff --git a/filcnaplo/lib/api/providers/user_provider.dart b/filcnaplo/lib/api/providers/user_provider.dart index 54ea4d8..97be1f8 100644 --- a/filcnaplo/lib/api/providers/user_provider.dart +++ b/filcnaplo/lib/api/providers/user_provider.dart @@ -25,9 +25,9 @@ class UserProvider with ChangeNotifier { UserProvider({required SettingsProvider settings}) : _settings = settings; - void setUser(String userId) { + void setUser(String userId) async { _selectedUserId = userId; - _settings.update(lastAccountId: userId); + await _settings.update(lastAccountId: userId); updateWidget(); notifyListeners(); }