diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-10-30 17:04:19 +0100 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-10-30 17:04:19 +0100 |
| commit | 4d7c3bf0866583641bebd83c8a34388658a88d05 (patch) | |
| tree | 049506a504640748fc64a81420111098a22a5fdb /Client/BrzoDoLokacije/app/src/main/res/layout | |
| parent | 913e9e8269bf595ba06d69114ec8e6a69caf32f9 (diff) | |
| parent | 53dd3a9e2eee27a69c349b7f2e1c295f19fdb114 (diff) | |
Reseni konflikti.
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
| -rw-r--r-- | Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home.xml | 12 | ||||
| -rw-r--r-- | Client/BrzoDoLokacije/app/src/main/res/layout/list_item.xml | 24 |
2 files changed, 31 insertions, 5 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home.xml index ee5503f..4d066aa 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".Fragments.FragmentHome"> - <!-- TODO: Update blank fragment layout --> - <TextView - android:layout_width="match_parent" + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvMain" android:layout_height="match_parent" - android:text="Home" /> + android:layout_width="match_parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent"/> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/list_item.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/list_item.xml new file mode 100644 index 0000000..fe53ac5 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/list_item.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="#B3E5FC" + android:layout_margin="5dp" + android:padding="5dp"> + <TextView + android:id="@+id/tvId" + android:text="Id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + <TextView + android:id="@+id/tvName" + android:text="Name" + android:layout_marginTop="5dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvId" /> +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |