Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved fonts

This commit is contained in:
daniel oeh 2014-04-26 23:07:11 +02:00
parent 1fe2a8da45
commit a7c8438b15
17 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/Roboto-Light.ttf Normal file
View File

Binary file not shown.

BIN
assets/Roboto.ttf Normal file
View File

Binary file not shown.

12
res/layout/addfeed.xml
View File

@ -20,9 +20,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_margin="16dp" android:layout_margin="16dp"
android:textSize="@dimen/text_size_large" style="@style/AntennaPod.TextView.Heading"
android:textColor="@color/bright_blue"
android:textStyle="italic"
android:text="@string/txtvfeedurl_label"/> android:text="@string/txtvfeedurl_label"/>
<EditText <EditText
@ -48,9 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/butConfirm" android:layout_below="@id/butConfirm"
android:layout_margin="8dp" android:layout_margin="8dp"
android:textSize="@dimen/text_size_large" style="@style/AntennaPod.TextView.Heading"
android:textColor="@color/bright_blue"
android:textStyle="italic"
android:text="@string/podcastdirectories_label"/> android:text="@string/podcastdirectories_label"/>
<TextView <TextView
@ -77,9 +73,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/butBrowseGpoddernet" android:layout_below="@id/butBrowseGpoddernet"
android:layout_margin="8dp" android:layout_margin="8dp"
android:textSize="@dimen/text_size_large" style="@style/AntennaPod.TextView.Heading"
android:textColor="@color/bright_blue"
android:textStyle="italic"
android:text="@string/opml_import_label"/> android:text="@string/opml_import_label"/>
<TextView <TextView

27
res/layout/audioplayer_activity.xml
View File

@ -38,8 +38,9 @@
<TextView <TextView
android:id="@+id/txtvTitle" android:id="@+id/txtvTitle"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
@ -48,25 +49,11 @@
android:layout_toRightOf="@id/butNavLeft" android:layout_toRightOf="@id/butNavLeft"
android:ellipsize="marquee" android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever" android:marqueeRepeatLimit="marquee_forever"
android:maxLines="1" android:maxLines="2"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_small" android:textSize="16sp"
android:textStyle="bold"/> android:fontFamily="sans-serif-light"
/>
<TextView
android:id="@+id/txtvFeed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/txtvTitle"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_toLeftOf="@id/butNavRight"
android:layout_toRightOf="@id/butNavLeft"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:maxLines="1"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_small"/>
</RelativeLayout> </RelativeLayout>
<View <View
@ -141,6 +128,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/position_default_label" android:text="@string/position_default_label"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_micro"/> android:textSize="@dimen/text_size_micro"/>
<TextView <TextView
@ -154,6 +142,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/position_default_label" android:text="@string/position_default_label"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_micro"/> android:textSize="@dimen/text_size_micro"/>
<SeekBar <SeekBar

2
res/layout/external_player_fragment.xml
View File

@ -45,7 +45,7 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:textSize="18sp" android:textSize="18sp"
android:fontFamily="sans-serif-condensed"/> android:fontFamily="sans-serif-light"/>
</RelativeLayout> </RelativeLayout>
<ImageButton <ImageButton

10
res/layout/feedinfo.xml
View File

@ -26,9 +26,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_margin="4dp" android:layout_margin="4dp"
android:layout_toRightOf="@id/imgvCover" android:layout_toRightOf="@id/imgvCover"
android:textSize="@dimen/text_size_large" style="@style/AntennaPod.TextView.Heading"/>
android:textStyle="bold"
android:textColor="?android:attr/textColorPrimary"/>
<View <View
android:id="@+id/divider" android:id="@+id/divider"
@ -99,12 +97,11 @@
<TextView <TextView
android:id="@+id/txtvSettings" android:id="@+id/txtvSettings"
style="@style/AntennaPod.TextView.Heading"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:text="@string/podcast_settings_label" android:text="@string/podcast_settings_label"
android:textSize="@dimen/text_size_medium"
android:textColor="?android:attr/textColorPrimary"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="24dp"/> android:layout_marginTop="24dp"/>
@ -119,13 +116,12 @@
android:textColor="?android:attr/textColorPrimary"/> android:textColor="?android:attr/textColorPrimary"/>
<TextView <TextView
style="@style/AntennaPod.TextView.Heading"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:textSize="@dimen/text_size_medium"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/description_label"/> android:text="@string/description_label"/>
<TextView <TextView

3
res/layout/feeditemlist_header.xml
View File

@ -25,8 +25,7 @@
android:layout_toRightOf="@id/imgvCover" android:layout_toRightOf="@id/imgvCover"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:lines="1" android:lines="1"
android:textColor="?android:attr/textColorPrimary" style="@style/AntennaPod.TextView.Heading"
android:textSize="@dimen/text_size_medium"
android:layout_margin="4dp"/> android:layout_margin="4dp"/>
<TextView <TextView

4
res/layout/gpodnetauth_credentials.xml
View File

@ -10,10 +10,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/gpodnetauth_login_title" android:text="@string/gpodnetauth_login_title"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:textSize="@dimen/text_size_large"
android:layout_margin="16dp" android:layout_margin="16dp"
android:textColor="@color/bright_blue" style="@style/AntennaPod.TextView.Heading"/>
android:textStyle="italic"/>
<TextView <TextView
android:id="@id/txtvDescription" android:id="@id/txtvDescription"

4
res/layout/gpodnetauth_device.xml
View File

@ -10,10 +10,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/gpodnetauth_device_title" android:text="@string/gpodnetauth_device_title"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:textSize="@dimen/text_size_large"
android:layout_margin="16dp" android:layout_margin="16dp"
android:textColor="@color/bright_blue" style="@style/AntennaPod.TextView.Heading"/>
android:textStyle="italic"/>
<TextView <TextView
android:id="@+id/txtvDescription" android:id="@+id/txtvDescription"

4
res/layout/gpodnetauth_finish.xml
View File

@ -10,10 +10,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/gpodnetauth_finish_title" android:text="@string/gpodnetauth_finish_title"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:textSize="@dimen/text_size_large"
android:layout_margin="16dp" android:layout_margin="16dp"
android:textColor="@color/bright_blue" style="@style/AntennaPod.TextView.Heading"/>
android:textStyle="italic"/>
<TextView <TextView
android:id="@+id/txtvDescription" android:id="@+id/txtvDescription"

4
res/layout/new_episodes_listdivider.xml
View File

@ -9,10 +9,8 @@
android:padding="12dp" android:padding="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/text_size_large"
android:textColor="@color/bright_blue"
android:textAllCaps="true" android:textAllCaps="true"
android:textStyle="italic" style="@style/AntennaPod.TextView.Heading"
android:text="@string/recently_published_episodes_label"/> android:text="@string/recently_published_episodes_label"/>
</LinearLayout> </LinearLayout>

3
res/layout/onlinefeedview_header.xml
View File

@ -23,8 +23,7 @@
android:layout_toRightOf="@id/imgvCover" android:layout_toRightOf="@id/imgvCover"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:lines="1" android:lines="1"
android:textColor="?android:attr/textColorPrimary" style="@style/AntennaPod.TextView.Heading"
android:textSize="@dimen/text_size_medium"
android:layout_margin="4dp"/> android:layout_margin="4dp"/>
<TextView <TextView

9
res/values-v16/styles.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium">
<item name="android:textSize">@dimen/text_size_large</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">sans-serif-light</item>
</style>
</resources>

6
res/values/styles.xml
View File

@ -117,4 +117,10 @@
<item name="android:textColor">#fff</item> <item name="android:textColor">#fff</item>
<item name="android:text">@string/undo</item> <item name="android:text">@string/undo</item>
</style> </style>
<style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium">
<item name="android:textSize">@dimen/text_size_large</item>
<item name="android:textStyle">italic</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
</resources> </resources>

3
src/de/danoeh/antennapod/activity/AudioplayerActivity.java
View File

@ -70,7 +70,6 @@ public class AudioplayerActivity extends MediaplayerActivity {
private int savedPosition = -1; private int savedPosition = -1;
private TextView txtvTitle; private TextView txtvTitle;
private TextView txtvFeed;
private Button butPlaybackSpeed; private Button butPlaybackSpeed;
private ImageButton butNavLeft; private ImageButton butNavLeft;
private ImageButton butNavRight; private ImageButton butNavRight;
@ -403,7 +402,6 @@ public class AudioplayerActivity extends MediaplayerActivity {
drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
navList = (ListView) findViewById(R.id.nav_list); navList = (ListView) findViewById(R.id.nav_list);
txtvTitle = (TextView) findViewById(R.id.txtvTitle); txtvTitle = (TextView) findViewById(R.id.txtvTitle);
txtvFeed = (TextView) findViewById(R.id.txtvFeed);
butNavLeft = (ImageButton) findViewById(R.id.butNavLeft); butNavLeft = (ImageButton) findViewById(R.id.butNavLeft);
butNavRight = (ImageButton) findViewById(R.id.butNavRight); butNavRight = (ImageButton) findViewById(R.id.butNavRight);
butPlaybackSpeed = (Button) findViewById(R.id.butPlaybackSpeed); butPlaybackSpeed = (Button) findViewById(R.id.butPlaybackSpeed);
@ -550,7 +548,6 @@ public class AudioplayerActivity extends MediaplayerActivity {
return false; return false;
} }
txtvTitle.setText(media.getEpisodeTitle()); txtvTitle.setText(media.getEpisodeTitle());
txtvFeed.setText(media.getFeedTitle());
if (media.getChapters() != null) { if (media.getChapters() != null) {
butNavRight.setVisibility(View.VISIBLE); butNavRight.setVisibility(View.VISIBLE);
} else { } else {

2
src/de/danoeh/antennapod/dialog/FeedItemDialog.java
View File

@ -248,7 +248,7 @@ public class FeedItemDialog extends Dialog {
private String applyWebviewStyle(String textColor, String data) { private String applyWebviewStyle(String textColor, String data) {
final String WEBVIEW_STYLE = "<html><head><style type=\"text/css\"> * { color: %s; font-family: Helvetica; line-height: 1.3em; font-size: 11pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }</style></head><body>%s</body></html>"; final String WEBVIEW_STYLE = "<html><head><style type=\"text/css\"> @font-face { font-family: 'Roboto-Light'; src: url('file:///android_asset/Roboto-Light.ttf'); } * { color: %s; font-family: roboto-Light; font-size: 11pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }</style></head><body>%s</body></html>";
final int pageMargin = (int) TypedValue.applyDimension( final int pageMargin = (int) TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 8, getContext().getResources() TypedValue.COMPLEX_UNIT_DIP, 8, getContext().getResources()
.getDisplayMetrics() .getDisplayMetrics()

2
src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
View File

@ -236,7 +236,7 @@ public class ItemDescriptionFragment extends Fragment {
* value is inserted directly into the CSS String. * value is inserted directly into the CSS String.
*/ */
private String applyWebviewStyle(String textColor, String data) { private String applyWebviewStyle(String textColor, String data) {
final String WEBVIEW_STYLE = "<html><head><style type=\"text/css\"> * { color: %s; font-family: Helvetica; line-height: 1.5em; font-size: 11pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }</style></head><body>%s</body></html>"; final String WEBVIEW_STYLE = "<html><head><style type=\"text/css\"> @font-face { font-family: 'Roboto-Light'; src: url('file:///android_asset/Roboto-Light.ttf'); } * { color: %s; font-family: roboto-Light; font-size: 11pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }</style></head><body>%s</body></html>";
final int pageMargin = (int) TypedValue.applyDimension( final int pageMargin = (int) TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 8, getResources() TypedValue.COMPLEX_UNIT_DIP, 8, getResources()
.getDisplayMetrics()); .getDisplayMetrics());