Archived
Changed 'px' to 'dp' in few files, removed header from landscape mode of main screen.
This commit is contained in:
Robert Kolner committed
1 parent
57752b1aed
commit
ddaf0a40c9
3 files changed
+62
-68
No files matched your search
+41
-51
@@ -1,60 +1,50 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent" android:layout_height="match_parent">
|
||||
|
||||
<!-- MENU, no header, because there is no space: -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_below="@id/header"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center">
|
||||
|
||||
<!-- Header -->
|
||||
<include layout="@layout/header"
|
||||
<!-- Opening hours: -->
|
||||
<include layout="@layout/main_hours"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent" />
|
||||
|
||||
<!-- Row nr 1: -->
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_alignParentTop="true"/>
|
||||
|
||||
<!-- MENU: -->
|
||||
<LinearLayout
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_below="@id/header"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginTop="20px"
|
||||
android:layout_marginBottom="20px"
|
||||
android:orientation="vertical"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center">
|
||||
|
||||
<!-- Opening hours: -->
|
||||
<include layout="@layout/main_hours"
|
||||
<include layout="@layout/main_tile_program"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_alignParentTop="true"/>
|
||||
|
||||
<!-- Row nr 1: -->
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp" />
|
||||
|
||||
<include layout="@layout/main_tile_news"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center">
|
||||
|
||||
<include layout="@layout/main_tile_program"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_margin="5px" />
|
||||
|
||||
<include layout="@layout/main_tile_news"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_margin="5px" />
|
||||
|
||||
<include layout="@layout/main_tile_tickets"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_margin="5px" />
|
||||
|
||||
<include layout="@layout/main_tile_join"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_margin="5px" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
android:layout_margin="5dp" />
|
||||
|
||||
<include layout="@layout/main_tile_tickets"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_margin="5dp" />
|
||||
|
||||
<include layout="@layout/main_tile_join"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_margin="5dp" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
+17
-17
@@ -2,7 +2,7 @@
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/main_menu_hours"
|
||||
android:layout_marginBottom="20px"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="vertical">
|
||||
@@ -17,8 +17,8 @@
|
||||
<LinearLayout android:id="@+id/main_menu_hours_neuf_header"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
@@ -26,8 +26,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:layout_marginLeft="20px"
|
||||
android:text="Chateau Neuf" />
|
||||
android:layout_marginLeft="20dp"
|
||||
android:text="@string/chateau_neuf" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_neuf"
|
||||
@@ -40,8 +40,8 @@
|
||||
<LinearLayout android:id="@+id/main_menu_hours_bc_header"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
@@ -49,8 +49,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:layout_marginLeft="20px"
|
||||
android:text="BokCaféen" />
|
||||
android:layout_marginLeft="20dp"
|
||||
android:text="@string/BC" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_bc"
|
||||
@@ -63,8 +63,8 @@
|
||||
<LinearLayout android:id="@+id/main_menu_hours_gb_header"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
@@ -72,8 +72,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:layout_marginLeft="20px"
|
||||
android:text="Glassbaren" />
|
||||
android:layout_marginLeft="20dp"
|
||||
android:text="@string/GB" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_gb"
|
||||
@@ -86,8 +86,8 @@
|
||||
<LinearLayout android:id="@+id/main_menu_hours_to_header"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_marginTop="10px"
|
||||
android:layout_marginBottom="10px"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
@@ -95,8 +95,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_weight="0.5"
|
||||
android:layout_marginLeft="20px"
|
||||
android:text="Billettluka" />
|
||||
android:layout_marginLeft="20dp"
|
||||
android:text="@string/billettluka" />
|
||||
|
||||
<!-- This is set in Java: -->
|
||||
<TextView android:id="@+id/main_menu_hours_to"
|
||||
|
||||
@@ -15,4 +15,8 @@
|
||||
<string name="main_menu_tickets">BILLETTER</string><string name="main_menu_join">OM DNS</string>
|
||||
<string name="main_menu_news">NYHETER</string>
|
||||
<string name="calendar_not_found">Kunne ikke finne kalender-app. Avbryter.</string>
|
||||
<string name="chateau_neuf">Chateau Neuf</string>
|
||||
<string name="BC">BokCaféen</string>
|
||||
<string name="GB">Glassbaren</string>
|
||||
<string name="billettluka">Billettluka</string>
|
||||
</resources>
|
||||
Reference in new issue
Block a user