aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/fragment_observations.xml29
-rw-r--r--app/src/main/res/layout/observations_list.xml16
-rw-r--r--app/src/main/res/values/strings.xml2
3 files changed, 29 insertions, 18 deletions
diff --git a/app/src/main/res/layout/fragment_observations.xml b/app/src/main/res/layout/fragment_observations.xml
index 791c16c..3396fcc 100644
--- a/app/src/main/res/layout/fragment_observations.xml
+++ b/app/src/main/res/layout/fragment_observations.xml
@@ -7,32 +7,25 @@
android:layout_height="match_parent"
tools:context=".ObservationsFragment">
- <android.support.v4.view.ViewPager
- xmlns:android="http://schemas.android.com/apk/res/android"
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:context="org.marcinzelent.liberavem.MainActivity"
- tools:showIn="@layout/app_bar_main">
+ android:orientation="vertical">
<android.support.design.widget.TabLayout
+ android:id="@+id/sliding_tabs"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ app:tabMode="fixed" />
- <android.support.design.widget.TabItem
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="My observations" />
-
- <android.support.design.widget.TabItem
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="All observations" />
+ <android.support.v4.view.ViewPager
+ android:id="@+id/viewpager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/white" />
- </android.support.design.widget.TabLayout>
- </android.support.v4.view.ViewPager>
+ </LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
diff --git a/app/src/main/res/layout/observations_list.xml b/app/src/main/res/layout/observations_list.xml
new file mode 100644
index 0000000..8be21a1
--- /dev/null
+++ b/app/src/main/res/layout/observations_list.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.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="match_parent">
+
+ <ListView
+ android:id="@+id/observations_list_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+</android.support.constraint.ConstraintLayout> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6ef134..1f045bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -86,4 +86,6 @@
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
+ <string name="my_observations">My observations</string>
+ <string name="all_observations">All observations</string>
</resources>