edb/android-app
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Added text styles and strings.

Browse Source
This commit is contained in:
Robert Kolner committed 2011-12-05 17:45:25 +01:00
1 parent ffdcad4eea
commit ddd474637b
4 files changed
+35 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

res/layout/footer.xml
+2 -2
View File
@@ -14,7 +14,7 @@
android:textStyle="bold"
android:onClick="clickHandler"
android:clickable="true"
android:text="@string/program_button" />
android:text="@string/main_menu_program" />
<TextView
android:id="@+id/bli_med_button"
android:layout_height="wrap_content"
@@ -25,5 +25,5 @@
android:textStyle="bold"
android:onClick="clickHandler"
android:clickable="true"
android:text="@string/bli_med_button" />
android:text="@string/main_menu_join" />
</LinearLayout>
res/layout/main.xml
+12 -24
View File
@@ -35,7 +35,7 @@
<!-- OPENING HOURS: -->
<TextView android:id="@+id/main_menu_hours_header"
style="@style/MetroTileText_bg"
style="@style/OpeningHoursHeaderText"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/main_menu_opening_hours" />
@@ -48,23 +48,19 @@
android:orientation="horizontal">
<TextView
style="@style/MetroTileText"
android:textSize="12sp"
style="@style/OpeningHoursText"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="0.5"
android:layout_marginLeft="20px"
android:gravity="left"
android:text="Chateau Neuf" />
<!-- This is set in Java: -->
<TextView android:id="@+id/main_menu_hours_neuf"
style="@style/MetroTileText"
android:textSize="10sp"
style="@style/OpeningHoursText"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="0.5"
android:gravity="left" />
android:layout_weight="0.5" />
</LinearLayout>
<LinearLayout android:id="@+id/main_menu_hours_bc_header"
@@ -75,23 +71,19 @@
android:orientation="horizontal">
<TextView
style="@style/MetroTileText"
android:textSize="12sp"
style="@style/OpeningHoursText"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="0.5"
android:layout_marginLeft="20px"
android:gravity="left"
android:text="Bokcaféen" />
<!-- This is set in Java: -->
<TextView android:id="@+id/main_menu_hours_bc"
style="@style/MetroTileText"
android:textSize="10sp"
style="@style/OpeningHoursText"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="0.5"
android:gravity="left" />
android:layout_weight="0.5" />
</LinearLayout>
<LinearLayout android:id="@+id/main_menu_hours_gb_header"
@@ -102,23 +94,19 @@
android:orientation="horizontal">
<TextView
style="@style/MetroTileText"
android:textSize="12sp"
style="@style/OpeningHoursText"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="0.5"
android:layout_marginLeft="20px"
android:gravity="left"
android:text="Glassbaren" />
<!-- This is set in Java: -->
<TextView android:id="@+id/main_menu_hours_gb"
style="@style/MetroTileText"
android:textSize="10sp"
style="@style/OpeningHoursText"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="0.5"
android:gravity="left" />
android:layout_weight="0.5" />
</LinearLayout>
</LinearLayout>
@@ -144,7 +132,7 @@
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_alignParentBottom="true"
android:text="@string/program_button" />
android:text="@string/main_menu_program" />
</RelativeLayout>
<RelativeLayout android:id="@+id/main_menu_tickets"
@@ -188,7 +176,7 @@
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_alignParentBottom="true"
android:text="@string/bli_med_button" />
android:text="@string/main_menu_join" />
</RelativeLayout>
<RelativeLayout android:id="@+id/main_menu_unused"
res/values/strings.xml
+5 -5
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Studentersamfundet</string>
<string name="program_button">PROGRAM</string>
<string name="bli_med_button">BLI MED</string>
<string name="event_link_button">Gå til nettsiden</string>
<string name="error_noconnection_firstart">Ingen nettilkobling. Du må være tilkoblet nettet for å se programmet.</string>
<string name="error_noconnection_noupdate">Ingen nettilkobling. Programmet er altså ikke oppdatert.</string>
@@ -10,7 +10,7 @@
<string name="menu_refresh">Oppdater</string>
<string name="menu_categories">Kategorier</string>
<string name="choose_category">Velg kategori</string>
<string name="error_loading">Vent til oppdateringen fullfører</string>
<string name="main_menu_opening_hours">ÅPNINGSTIDER</string>
<string name="main_menu_tickets">BILLETTER</string>
<string name="error_loading">Vent til oppdateringen fullfører</string><string name="main_menu_program">PROGRAM</string>
<string name="main_menu_opening_hours">ÅPNINGSTIDER I DAG</string>
<string name="main_menu_tickets">BILLETTER</string><string name="main_menu_join">BLI MED</string>
</resources>
res/values/styles.xml
+16
View File
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- MAIN MENU STYLES: -->
<!-- Opening hours: -->
<style name="OpeningHoursHeaderText" parent="@android:style/TextAppearance">
<item name="android:background">#80303030</item>
<item name="android:textColor">#ffffff</item>
<item name="android:textSize">16sp</item>
<item name="android:gravity">center</item>
</style>
<style name="OpeningHoursText" parent="@android:style/TextAppearance">
<item name="android:textColor">#ffffff</item>
<item name="android:textSize">14sp</item>
<item name="android:gravity">left</item>
</style>
<!-- "Metro" tiles: -->
<style name="MetroTile">
<item name="android:background">@drawable/metro_background</item>
</style>