diff options
author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-11-01 12:41:50 +0100 |
---|---|---|
committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-11-01 12:41:50 +0100 |
commit | 6d5bc4fce9d818f50b8387650a4ac1adda677cfb (patch) | |
tree | 8f34257531a08ff7ed6e53f6e2bc8b013434848d /Client/BrzoDoLokacije/app/src/main/res/layout | |
parent | 544695029bca77f688a708677f4861d8df17ae9d (diff) |
Podešen izgled Login i Register stranice. Dodati resursi za podešavanje izgleda.
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
3 files changed, 94 insertions, 34 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml index ac526e0..92b84a0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml @@ -5,39 +5,97 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:elevation="0dp" - android:foregroundGravity="fill" - android:foregroundTint="#5E010F13" - android:foregroundTintMode="add" + android:background="@drawable/b1" tools:context=".Activities.ActivityLoginRegister"> - <Button - android:id="@+id/btnFragmentActivityLRLogin" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:elevation="1dp" - android:text="Prijavi se" - app:layout_constraintEnd_toStartOf="@+id/btnFragmentActivityLRRegister" - app:layout_constraintHorizontal_bias="0.846" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - <Button - android:id="@+id/btnFragmentActivityLRRegister" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="52dp" - android:elevation="100dp" - android:text="Registruj se" + <ImageView + android:id="@+id/imageView2" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0" + app:srcCompat="@drawable/gradient" /> + + <androidx.constraintlayout.widget.ConstraintLayout + android:background="@drawable/login_register_background_top_radius" + + android:id="@+id/linearLayout" + android:layout_width="0dp" + android:layout_height="55dp" + android:layout_marginStart="50dp" + android:layout_marginEnd="50dp" + android:gravity="center|center_horizontal" + android:orientation="horizontal" + app:layout_constraintBottom_toTopOf="@+id/flFragmentActivityLRFragmentsView" + app:layout_constraintEnd_toEndOf="@+id/imageView2" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0"> + + <ImageView + android:id="@+id/imageView5" + android:layout_width="280dp" + android:layout_height="40dp" + android:background="@drawable/rounded_white_button_login" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0"></ImageView> + + <android.widget.Button + android:id="@+id/btnFragmentActivityLRLogin" + android:layout_width="139dp" + android:layout_height="40dp" + android:background="@drawable/rounded_cyan_button" + android:elevation="25dp" + android:padding="0dp" + + android:text="Prijavi se" + android:textColor="@color/white" + app:layout_constraintBottom_toBottomOf="@+id/imageView5" + app:layout_constraintEnd_toStartOf="@+id/btnFragmentActivityLRRegister" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="@+id/imageView5" + app:layout_constraintTop_toTopOf="@+id/imageView5" /> + + <android.widget.Button + android:id="@+id/btnFragmentActivityLRRegister" + android:layout_width="140dp" + android:layout_height="40dp" + android:textColor="#FF1C789A" + android:background="@drawable/rounded_transparent_button" + android:elevation="25dp" + android:padding="0dp" + android:text="Registruj se" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="@+id/imageView5" + app:layout_constraintTop_toTopOf="@+id/imageView5" + app:layout_constraintVertical_bias="0.0" /> + + </androidx.constraintlayout.widget.ConstraintLayout> <FrameLayout android:id="@+id/flFragmentActivityLRFragmentsView" android:layout_width="0dp" - android:layout_height="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="50dp" + android:layout_marginEnd="50dp" + android:background="@drawable/login_register_background_bottom_radius" + android:elevation="20dp" + android:foregroundGravity="center_vertical|center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/btnFragmentActivityLRLogin"> + app:layout_constraintTop_toTopOf="@+id/imageView2" + app:layout_constraintVertical_bias="0.411"> + </FrameLayout> + + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml index 9a9702a..c45051b 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml @@ -4,21 +4,21 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_gravity="center_horizontal" tools:context=".Fragments.FragmentLogin"> <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="400dp" - android:layout_height="352dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:padding="20dp" - > + + android:padding="20dp"> <TextView android:id="@+id/tvFragimentLoginEmail" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:backgroundTint="#00B8D4" android:text="Email" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -45,8 +45,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/etFragmentLoginEmail" - /> + app:layout_constraintTop_toBottomOf="@+id/etFragmentLoginEmail" /> <EditText android:id="@+id/etFragmentLoginPassword" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml index 3280aed..c9d50a0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml @@ -4,15 +4,18 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".Fragments.FragmentRegister"> + tools:context=".Fragments.FragmentRegister" + android:layout_gravity="center_horizontal" + +> <!-- TODO: Update blank fragment layout --> <androidx.constraintlayout.widget.ConstraintLayout - android:padding="20dp" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_horizontal"> + android:layout_height="432dp" + android:layout_gravity="center_horizontal" + android:padding="20dp"> <EditText android:id="@+id/etFragmentRegisterPassword" |