mirror of
https://codeberg.org/OpenTracksApp/OpenTracks.git
synced 2026-10-02 09:33:06 +02:00
merge heads
This commit is contained in:
Jimmy Shih
@@ -15,11 +15,25 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<style name="ThemeSelector" parent="android:Theme.Holo">>
|
||||
<item name="android:actionBarStyle">@style/MyTracksActionBar</item>
|
||||
</style>
|
||||
<style name="BottomButton" parent="@android:style/Widget.Holo.Button.Borderless">
|
||||
<!-- Same as BottomButton in values/styles.xml except inheriting from a parent -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
<item name="android:maxLines">2</item>
|
||||
</style>
|
||||
<style name="BottomButtonBar" parent="@android:style/Holo.ButtonBar">
|
||||
<!-- Same as BottomButtonBar in values/styles.xml except inheriting from a parent -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:orientation">horizontal</item>
|
||||
<item name="android:measureWithLargestChild">true</item>
|
||||
</style>
|
||||
<style name="MyTracksActionBar" parent="@android:style/Widget.Holo.ActionBar">
|
||||
<!-- Same image as the source except using a grey line instead of a blue line -->
|
||||
<item name="android:background">@drawable/ab_transparent_dark_holo</item>
|
||||
</style>
|
||||
</resources>
|
||||
<style name="ThemeSelector" parent="android:Theme.Holo">
|
||||
<item name="android:actionBarStyle">@style/MyTracksActionBar</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2013 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
<!-- The style for large size text -->
|
||||
<style name="TextLarge" parent="@android:style/TextAppearance.Holo.Large">
|
||||
<!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
<!-- The style for medium size text -->
|
||||
<style name="TextMedium" parent="@android:style/TextAppearance.Holo.Medium">
|
||||
<!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
<!-- The style for small size text -->
|
||||
<style name="TextSmall" parent="@android:style/TextAppearance.Holo.Small">
|
||||
<!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -14,23 +14,53 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- The style for choose activity text -->
|
||||
<style name="TextChooseActivity">
|
||||
<style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless">
|
||||
<!-- Same as BottomButton in values/styles.xml except inheriting from a parent -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
<item name="android:maxLines">2</item>
|
||||
</style>
|
||||
<style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
|
||||
<!-- Same as BottomButtonBar in values/styles.xml except inheriting from a parent and adding measureWithLargestChild -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:orientation">horizontal</item>
|
||||
<item name="android:measureWithLargestChild">true</item>
|
||||
</style>
|
||||
<style name="TextChooseActivity">
|
||||
<!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
|
||||
<!-- However, not able to specify textAppearance to @android:attr/textAppearanceListItemSmall -->
|
||||
</style>
|
||||
<!-- The style for large size text -->
|
||||
<style name="TextLarge" parent="@android:style/TextAppearance.DeviceDefault.Large">
|
||||
<!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
<!-- The style for medium size text -->
|
||||
<style name="TextMedium" parent="@android:style/TextAppearance.DeviceDefault.Medium">
|
||||
<!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
<!-- The style for small size text -->
|
||||
<style name="TextSmall" parent="@android:style/TextAppearance.DeviceDefault.Small">
|
||||
<!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
</style>
|
||||
</resources>
|
||||
<style name="TrackWidgetLabel">
|
||||
<!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
|
||||
<item name="android:layout_gravity">center_horizontal</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:textColor">@color/orange</item>
|
||||
<item name="android:textSize">10dp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textAllCaps">true</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -20,18 +20,17 @@ limitations under the License.
|
||||
<item name="android:paddingLeft">48dp</item>
|
||||
</style>
|
||||
<!-- bottom button -->
|
||||
<style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless">
|
||||
<style name="BottomButton">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
<item name="android:maxLines">2</item>
|
||||
</style>
|
||||
<!-- bottom button bar -->
|
||||
<style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
|
||||
<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>
|
||||
<item name="android:measureWithLargestChild">true</item>
|
||||
</style>
|
||||
<!-- choose upload service checkbox -->
|
||||
<style name="ChooseUploadServiceCheckBox" parent="@style/TextMedium">
|
||||
@@ -290,7 +289,6 @@ limitations under the License.
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:textAllCaps">true</item>
|
||||
<item name="android:textColor">@color/orange</item>
|
||||
<item name="android:textSize">10dp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
@@ -348,21 +346,22 @@ limitations under the License.
|
||||
<item name="android:textSize">18dp</item>
|
||||
</style>
|
||||
<!-- track widget value -->
|
||||
<style name="TrackWidgetValue" parent="@style/TextMedium">
|
||||
<style name="TrackWidgetValue">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_weight">2</item>
|
||||
<item name="android:layout_width">0dp</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
<item name="android:textSize">18dp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
<!-- track widget value 4x3 -->
|
||||
<style name="TrackWidgetValue4x3" parent="@style/TrackWidgetValue">
|
||||
<item name="android:textSize">28sp</item>
|
||||
<item name="android:textSize">28dp</item>
|
||||
</style>
|
||||
<!-- track widget value 4x4 -->
|
||||
<style name="TrackWidgetValue4x4" parent="@style/TrackWidgetValue">
|
||||
<item name="android:textSize">36sp</item>
|
||||
<item name="android:textSize">36dp</item>
|
||||
</style>
|
||||
<!-- track widget value container -->
|
||||
<style name="TrackWidgetValueContainer">
|
||||
|
||||
Reference in New Issue
Block a user