aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorHalzyn2015-06-04 15:31:02 +0200
committerHalzyn2015-06-04 15:31:02 +0200
commiteec2fd377e7e3472415d745b070324addb157c47 (patch)
treeea71b9a1698b17f20ba6fb0af20251a55377d8cd /app/src/main/res
parentAdded hamburger menu, working filters and unified inbox. Open old UI by going... (diff)
Started on first time boot but not yet finished, fixed cards
etc etc etc
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_article.xml10
-rwxr-xr-xapp/src/main/res/layout/item_feeditem.xml6
-rw-r--r--app/src/main/res/layout/walkthrough_activity.xml23
-rw-r--r--app/src/main/res/layout/walkthrough_single_view.xml5
4 files changed, 38 insertions, 6 deletions
diff --git a/app/src/main/res/layout/activity_article.xml b/app/src/main/res/layout/activity_article.xml
index b08fe38..da66067 100644
--- a/app/src/main/res/layout/activity_article.xml
+++ b/app/src/main/res/layout/activity_article.xml
@@ -2,19 +2,19 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
tools:context="org.rssin.android.ArticleActivity">
<ScrollView
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingTop="@dimen/activity_vertical_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
android:orientation="vertical">
<TextView
diff --git a/app/src/main/res/layout/item_feeditem.xml b/app/src/main/res/layout/item_feeditem.xml
index 3927038..1ecd1c5 100755
--- a/app/src/main/res/layout/item_feeditem.xml
+++ b/app/src/main/res/layout/item_feeditem.xml
@@ -11,7 +11,7 @@
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="15dp"
+ android:layout_margin="8dp"
card_view:cardElevation="6dp"
card_view:cardCornerRadius="2dp">
@@ -29,6 +29,10 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/font_size_small"/>
+ <TextView android:id="@+id/feeditem_date"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textSize="12sp"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/walkthrough_activity.xml b/app/src/main/res/layout/walkthrough_activity.xml
new file mode 100644
index 0000000..84a8c10
--- /dev/null
+++ b/app/src/main/res/layout/walkthrough_activity.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/view_pager"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_above="@+id/screen_navigation_button" />
+
+ <!-- This TextView will not swipe when you swipe in the ViewPager -->
+
+ <TextView
+ android:id="@id/screen_navigation_button"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:gravity="center"
+ android:padding="10dip"
+ android:textSize="18sp" />
+
+</RelativeLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/walkthrough_single_view.xml b/app/src/main/res/layout/walkthrough_single_view.xml
new file mode 100644
index 0000000..e8ef067
--- /dev/null
+++ b/app/src/main/res/layout/walkthrough_single_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/image_view"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" /> \ No newline at end of file