From 6d5bc4fce9d818f50b8387650a4ac1adda677cfb Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Tue, 1 Nov 2022 12:41:50 +0100 Subject: Podešen izgled Login i Register stranice. Dodati resursi za podešavanje izgleda. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/debug/res/drawable-xhdpi/b1.jpg | Bin 0 -> 8227096 bytes .../Activities/ActivityLoginRegister.kt | 14 ++- .../src/main/res/drawable/button_left_radius.xml | 12 +++ .../src/main/res/drawable/button_right_radius.xml | 12 +++ .../app/src/main/res/drawable/gradient.xml | 12 +++ .../login_register_background_bottom_radius.xml | 16 ++++ .../login_register_background_top_radius.xml | 15 +++ .../res/drawable/rounded_transparent_button.xml | 5 + .../res/drawable/rounded_white_button_login.xml | 21 ++--- .../main/res/layout/activity_login_register.xml | 104 ++++++++++++++++----- .../app/src/main/res/layout/fragment_login.xml | 13 ++- .../app/src/main/res/layout/fragment_register.xml | 11 ++- .../app/src/main/res/values/colors.xml | 1 + 13 files changed, 186 insertions(+), 50 deletions(-) create mode 100644 Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/b1.jpg create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_left_radius.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_right_radius.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/gradient.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/login_register_background_bottom_radius.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/login_register_background_top_radius.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_transparent_button.xml (limited to 'Client') diff --git a/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/b1.jpg b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/b1.jpg new file mode 100644 index 0000000..6c86a45 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/debug/res/drawable-xhdpi/b1.jpg differ diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt index c80992c..f5843aa 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt @@ -1,11 +1,14 @@ package com.example.brzodolokacije.Activities +import android.graphics.drawable.Drawable +import android.os.Build import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.util.Log import android.view.View import android.widget.Button import android.widget.Toast +import androidx.annotation.RequiresApi import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction @@ -20,6 +23,8 @@ class ActivityLoginRegister : AppCompatActivity() { private lateinit var register: Button + + @RequiresApi(Build.VERSION_CODES.M) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_login_register) @@ -33,6 +38,10 @@ class ActivityLoginRegister : AppCompatActivity() { fm.replace(R.id.flFragmentActivityLRFragmentsView,FragmentLogin()) fm.commit() login.setOnClickListener{ + login.setTextColor(getColor(R.color.white)) + register.setTextColor(getColor(R.color.teal_700)) + login.setBackgroundResource(R.drawable.rounded_cyan_button) + register.setBackgroundResource(R.drawable.rounded_transparent_button) Log.d("main","prijavi se") var fm: FragmentTransaction =supportFragmentManager.beginTransaction() @@ -42,7 +51,10 @@ class ActivityLoginRegister : AppCompatActivity() { register.setOnClickListener{ Log.d("main","prijavi se") - + register.setTextColor(getColor(R.color.white)) + login.setTextColor(getColor(R.color.teal_700)) + register.setBackgroundResource(R.drawable.rounded_cyan_button) + login.setBackgroundResource(R.drawable.rounded_transparent_button) var fm: FragmentTransaction =supportFragmentManager.beginTransaction() fm.replace(R.id.flFragmentActivityLRFragmentsView, FragmentRegister()) diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_left_radius.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_left_radius.xml new file mode 100644 index 0000000..8ab5223 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_left_radius.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_right_radius.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_right_radius.xml new file mode 100644 index 0000000..9b1ac29 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_right_radius.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/gradient.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/gradient.xml new file mode 100644 index 0000000..0e20af4 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/gradient.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/login_register_background_bottom_radius.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/login_register_background_bottom_radius.xml new file mode 100644 index 0000000..ac29f68 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/login_register_background_bottom_radius.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/login_register_background_top_radius.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/login_register_background_top_radius.xml new file mode 100644 index 0000000..5d71138 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/login_register_background_top_radius.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_transparent_button.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_transparent_button.xml new file mode 100644 index 0000000..5b420a0 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_transparent_button.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_white_button_login.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_white_button_login.xml index 60f4b4d..1a4c57d 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_white_button_login.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_white_button_login.xml @@ -1,16 +1,7 @@ - + + + + + - - - - \ No newline at end of file + \ No newline at end of file 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"> -