1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00

New styles for headers and metadata in event details.

This commit is contained in:
Christophe Beyls 2015-01-15 00:09:32 +01:00
parent 264012b8e9
commit d73c5c16cd
30 changed files with 25 additions and 52 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 548 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 506 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 941 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 674 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 402 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 511 B

View file

@ -39,24 +39,17 @@
android:layout_marginTop="8dp"
tools:text="FOSDEM Staff"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingLeft="@dimen/content_margin"
android:paddingRight="@dimen/content_margin"
android:paddingTop="8dp">
<View
style="@style/SeparatorLine"
android:layout_marginTop="8dp"/>
<TextView
android:id="@+id/track"
style="@style/Metadata"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_small_labels"
android:layout_marginTop="8dp"
android:drawableLeft="@drawable/ic_local_offer_grey600_18dp"
tools:text="Keynotes"/>
<TextView
@ -64,7 +57,7 @@
style="@style/Metadata"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_small_time"
android:drawableLeft="@drawable/ic_access_time_grey600_18dp"
tools:text="Day 1 (Saturday), 09:30 - 09:55"/>
<TextView
@ -72,8 +65,9 @@
style="@style/Metadata.Selectable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_small_place"
android:drawableLeft="@drawable/ic_place_grey600_18dp"
tools:text="Janson (Building J)"/>
</LinearLayout>
<TextView
@ -109,8 +103,6 @@
<TextView
style="@style/Header"
android:text="@string/related_links_header"/>
<View style="@style/HeaderLine"/>
</LinearLayout>
</LinearLayout>

View file

@ -1,13 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@style/Header"
xmlns:android="http://schemas.android.com/apk/res/android"
android:text="@string/talks_header"/>
<View style="@style/HeaderLine"/>
</LinearLayout>

View file

@ -14,13 +14,4 @@
<item name="android:textColorLink">?android:attr/colorAccent</item>
</style>
<!-- Styles -->
<style name="Metadata.Selectable">
<!-- Invert colors at theme level to allow using the white ripple selector -->
<item name="android:theme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
</resources>

View file

@ -89,7 +89,7 @@
<string name="settings_notifications_delay_summary">Delay before getting notified of an upcoming bookmarked event</string>
<!-- Event details -->
<string name="related_links_header">RELATED LINKS</string>
<string name="related_links_header">Related Links</string>
<string name="add_bookmark">Add to bookmarks</string>
<string name="remove_bookmark">Remove from bookmarks</string>
<string name="share">Share</string>
@ -101,7 +101,7 @@
</plurals>
<!-- Speaker info -->
<string name="talks_header">TALKS</string>
<string name="talks_header">Talks</string>
<string name="more_info">More info</string>
<!-- Others -->

View file

@ -67,32 +67,30 @@
<item name="textColor">@color/tab_text</item>
</style>
<style name="Metadata" parent="TextAppearance.AppCompat.Body1">
<item name="android:textColor">?android:textColorPrimaryInverse</item>
<style name="SeparatorLine">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
<item name="android:background">@color/translucent_grey</item>
</style>
<style name="Metadata" parent="TextAppearance.AppCompat.Subhead">
<item name="android:textColor">#666666</item>
<item name="android:gravity">center_vertical</item>
<item name="android:drawablePadding">8dp</item>
</style>
<style name="Metadata.Selectable">
<item name="android:background">@drawable/abc_item_background_holo_dark</item>
<item name="android:background">?attr/selectableItemBackground</item>
</style>
<style name="Header">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">5dp</item>
<item name="android:paddingLeft">@dimen/list_item_padding</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/fosdem_purple</item>
</style>
<style name="HeaderLine">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">2dp</item>
<item name="android:background">@color/fosdem_purple</item>
</style>
<style name="RoomImageDialogAnimations">
<item name="android:windowEnterAnimation">@anim/zoom_in</item>
<item name="android:windowExitAnimation">@anim/zoom_out</item>