forked from upstream-mirrors/OpenTracks
merge heads
This commit is contained in:
Jimmy Shih
@@ -30,7 +30,6 @@ limitations under the License.
|
||||
<style name="BottomButtonBar">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:orientation">horizontal</item>
|
||||
</style>
|
||||
<!-- bottom button divider -->
|
||||
<style name="BottomButtonDivider">
|
||||
@@ -84,7 +83,7 @@ limitations under the License.
|
||||
<item name="android:layout_marginBottom">8dp</item>
|
||||
<item name="android:layout_marginLeft">20dp</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
</style>
|
||||
</style>
|
||||
<!-- help answer -->
|
||||
<style name="HelpAnswer" parent="@style/TextSmall">
|
||||
<item name="android:autoLink">web</item>
|
||||
@@ -133,30 +132,31 @@ limitations under the License.
|
||||
<style name="StatsHorizontalLine">
|
||||
<item name="android:background">@color/stats_separator</item>
|
||||
<item name="android:layout_height">1dp</item>
|
||||
<item name="android:layout_marginLeft">8dp</item>
|
||||
<item name="android:layout_marginRight">8dp</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
</style>
|
||||
<!-- stats large item container -->
|
||||
<style name="StatsLargeItemContainer">
|
||||
<item name="android:layout_gravity">top</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_weight">10</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
<item name="android:orientation">vertical</item>
|
||||
<item name="android:paddingBottom">6dp</item>
|
||||
<item name="android:paddingLeft">8dp</item>
|
||||
<item name="android:paddingRight">8dp</item>
|
||||
<item name="android:paddingTop">6dp</item>
|
||||
</style>
|
||||
<!-- stats large label -->
|
||||
<style name="StatsLargeLabel" parent="@style/TextSmall">
|
||||
<item name="android:gravity">right</item>
|
||||
<item name="android:layout_gravity">right</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
<item name="android:singleLine">false</item>
|
||||
<item name="android:textColor">@color/stats_large_label</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
<!-- stats large value -->
|
||||
<style name="StatsLargeValue">
|
||||
<item name="android:layout_gravity">bottom</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
@@ -166,7 +166,7 @@ limitations under the License.
|
||||
</style>
|
||||
<!-- stats large value container -->
|
||||
<style name="StatsLargeValueContainer">
|
||||
<item name="android:layout_gravity">right</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginTop">-4dp</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
@@ -174,20 +174,26 @@ limitations under the License.
|
||||
<!-- stats scroll view -->
|
||||
<style name="StatsScrollView" parent="@style/ScrollView">
|
||||
<item name="android:scrollbarStyle">outsideOverlay</item>
|
||||
</style>
|
||||
<!-- stats small item container -->
|
||||
</style>
|
||||
<!-- stats small group container -->
|
||||
<style name="StatsSmallGroupContainer" parent="@style/StatsLargeItemContainer">
|
||||
<item name="android:layout_gravity">top|center</item>
|
||||
<item name="android:paddingTop">12dp</item>
|
||||
</style>
|
||||
<!-- stats small item container, for placing inside StatsSmallGroupContainer -->
|
||||
<style name="StatsSmallItemContainer" parent="@style/StatsLargeItemContainer">
|
||||
<item name="android:paddingTop">12dp</item>
|
||||
</style>
|
||||
<!-- stats small label -->
|
||||
<style name="StatsSmallLabel" parent="@style/TextSmall">
|
||||
<item name="android:gravity">right</item>
|
||||
<item name="android:layout_gravity">right</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
<item name="android:singleLine">false</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
<!-- stats small value -->
|
||||
<style name="StatsSmallValue" parent="@style/TextLarge">
|
||||
<item name="android:layout_gravity">bottom</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
</style>
|
||||
@@ -197,20 +203,15 @@ limitations under the License.
|
||||
</style>
|
||||
<!-- stats unit -->
|
||||
<style name="StatsUnit" parent="@style/TextSmall">
|
||||
<item name="android:layout_gravity">bottom</item>
|
||||
<item name="android:paddingLeft">4dp</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
</style>
|
||||
<!-- stats vertical spacer -->
|
||||
<style name="StatsVerticalSpacer">
|
||||
<item name="android:layout_height">match_parent</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
</style>
|
||||
<style name="Text">
|
||||
<style name="Text">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
</style>
|
||||
</style>
|
||||
<!-- text choose activity -->
|
||||
<style name="TextChooseActivity">
|
||||
<item name="android:textSize">18sp</item>
|
||||
@@ -257,7 +258,6 @@ limitations under the License.
|
||||
<item name="android:layout_height">0dp</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:orientation">horizontal</item>
|
||||
<item name="android:paddingBottom">4dp</item>
|
||||
<item name="android:paddingTop">4dp</item>
|
||||
</style>
|
||||
@@ -290,7 +290,6 @@ limitations under the License.
|
||||
<style name="TrackWidgetHorizontalSeparator">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:orientation">horizontal</item>
|
||||
</style>
|
||||
<!-- track widget item container -->
|
||||
<style name="TrackWidgetItemContainer">
|
||||
@@ -354,7 +353,7 @@ limitations under the License.
|
||||
<item name="android:layout_weight">2</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
</style>
|
||||
</style>
|
||||
<!-- track widget stats container -->
|
||||
<style name="TrackWidgetStatsContainer">
|
||||
<item name="android:clickable">true</item>
|
||||
@@ -369,7 +368,6 @@ limitations under the License.
|
||||
<item name="android:layout_height">0dp</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:orientation">horizontal</item>
|
||||
</style>
|
||||
<!-- track widget unit -->
|
||||
<style name="TrackWidgetUnit">
|
||||
@@ -412,7 +410,6 @@ limitations under the License.
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginTop">-4dp</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:orientation">horizontal</item>
|
||||
</style>
|
||||
<!-- track widget value container 4x3 -->
|
||||
<style name="TrackWidgetValueContainer4x3" parent="@style/TrackWidgetValueContainer">
|
||||
|
||||
Reference in New Issue
Block a user