diff --git a/build.gradle b/build.gradle index f257155..1e94440 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/theme/build.gradle b/theme/build.gradle index b6a8eb2..4215476 100644 --- a/theme/build.gradle +++ b/theme/build.gradle @@ -3,14 +3,14 @@ apply plugin: 'com.android.application' android { signingConfigs { } - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 23 + buildToolsVersion "23.0.2" defaultConfig { applicationId "de.marcelkapfer.cyngn.theme.raleway" minSdkVersion 19 - targetSdkVersion 21 - versionCode 1 - versionName "1.0" + targetSdkVersion 23 + versionCode 2 + versionName "1.1" } buildTypes { release { diff --git a/theme/src/main/AndroidManifest.xml b/theme/src/main/AndroidManifest.xml index 232c44e..481e901 100644 --- a/theme/src/main/AndroidManifest.xml +++ b/theme/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ - + diff --git a/theme/src/main/assets/fonts/DESCRIPTION.en_us.html b/theme/src/main/assets/fonts/DESCRIPTION.en_us.html new file mode 100644 index 0000000..e221c73 --- /dev/null +++ b/theme/src/main/assets/fonts/DESCRIPTION.en_us.html @@ -0,0 +1,20 @@ +

+Raleway is an elegant sans-serif typeface family. +Initially designed by Matt McInerney as a single thin weight, it was expanded into a 9 weight family by Pablo Impallari and Rodrigo Fuenzalida in 2012 and iKerned by Igino Marini. +A thorough review and italic was added in 2016. +

+

+It is a display face and the download features both old style and lining numerals, standard and discretionary ligatures, a pretty complete set of diacritics, as well as a stylistic alternate inspired by more geometric sans-serif typefaces than its neo-grotesque inspired default character set. +

+

+It also has a sister family, Raleway Dots. +

+

+More information can be found at theleagueofmoveabletype.com and impallari.com +

+

+To contribute to the project, visit github.com/impallari/Raleway +

+

+Updated: Feburary 2016, thoroughly updated the design with new spacing and kerning, raised f bar, added italics, new family naming metadata, and hinted with ttfautohint. +

diff --git a/theme/src/main/assets/fonts/FONTLOG.txt b/theme/src/main/assets/fonts/FONTLOG.txt old mode 100755 new mode 100644 index 6b50dfe..abc2756 --- a/theme/src/main/assets/fonts/FONTLOG.txt +++ b/theme/src/main/assets/fonts/FONTLOG.txt @@ -8,7 +8,7 @@ derivative works. Basic Font Information Raleway is an elegant sans-serif typeface family. Initially designed by -Matt McInerney as a single thin weight, it was expanded into a 9 weight family by Pablo Impallari and Rodrigo Fuenzalida in 2012 and iKerned by Igino Marini. In 2013 the Italics where added. +Matt McInerney as a single thin weight, it was expanded into a 9 weight family by Pablo Impallari and Rodrigo Fuenzalida in 2012 and iKerned by Igino Marini. It is a display face and the download features both old style and lining numerals, standard and discretionary ligatures, a pretty complete set of diff --git a/theme/src/main/assets/fonts/METADATA.pb b/theme/src/main/assets/fonts/METADATA.pb new file mode 100644 index 0000000..128e881 --- /dev/null +++ b/theme/src/main/assets/fonts/METADATA.pb @@ -0,0 +1,171 @@ +name: "Raleway" +designer: "Multiple Designers" +license: "OFL" +category: "SANS_SERIF" +date_added: "2012-09-07" +fonts { + name: "Raleway" + style: "normal" + weight: 100 + filename: "Raleway-Thin.ttf" + post_script_name: "Raleway-Thin" + full_name: "Raleway Thin" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 100 + filename: "Raleway-ThinItalic.ttf" + post_script_name: "Raleway-ThinItalic" + full_name: "Raleway Thin Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "normal" + weight: 200 + filename: "Raleway-ExtraLight.ttf" + post_script_name: "Raleway-ExtraLight" + full_name: "Raleway ExtraLight" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 200 + filename: "Raleway-ExtraLightItalic.ttf" + post_script_name: "Raleway-ExtraLightItalic" + full_name: "Raleway ExtraLight Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "normal" + weight: 300 + filename: "Raleway-Light.ttf" + post_script_name: "Raleway-Light" + full_name: "Raleway Light" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 300 + filename: "Raleway-LightItalic.ttf" + post_script_name: "Raleway-LightItalic" + full_name: "Raleway Light Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "normal" + weight: 400 + filename: "Raleway-Regular.ttf" + post_script_name: "Raleway-Regular" + full_name: "Raleway" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 400 + filename: "Raleway-Italic.ttf" + post_script_name: "Raleway-Italic" + full_name: "Raleway Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "normal" + weight: 500 + filename: "Raleway-Medium.ttf" + post_script_name: "Raleway-Medium" + full_name: "Raleway Medium" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 500 + filename: "Raleway-MediumItalic.ttf" + post_script_name: "Raleway-MediumItalic" + full_name: "Raleway Medium Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "normal" + weight: 600 + filename: "Raleway-SemiBold.ttf" + post_script_name: "Raleway-SemiBold" + full_name: "Raleway SemiBold" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 600 + filename: "Raleway-SemiBoldItalic.ttf" + post_script_name: "Raleway-SemiBoldItalic" + full_name: "Raleway SemiBold Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "normal" + weight: 700 + filename: "Raleway-Bold.ttf" + post_script_name: "Raleway-Bold" + full_name: "Raleway Bold" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 700 + filename: "Raleway-BoldItalic.ttf" + post_script_name: "Raleway-BoldItalic" + full_name: "Raleway Bold Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "normal" + weight: 800 + filename: "Raleway-ExtraBold.ttf" + post_script_name: "Raleway-ExtraBold" + full_name: "Raleway ExtraBold" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 800 + filename: "Raleway-ExtraBoldItalic.ttf" + post_script_name: "Raleway-ExtraBoldItalic" + full_name: "Raleway ExtraBold Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "normal" + weight: 900 + filename: "Raleway-Black.ttf" + post_script_name: "Raleway-Black" + full_name: "Raleway Black" + copyright: "Copyright (c) 2010 - 2013, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +fonts { + name: "Raleway" + style: "italic" + weight: 900 + filename: "Raleway-BlackItalic.ttf" + post_script_name: "Raleway-BlackItalic" + full_name: "Raleway Black Italic" + copyright: "Copyright (c) 2010 - 2012, Matt McInerney (matt@pixelspread.com), Pablo Impallari (impallari@gmail.com), Rodrigo Fuenzalida (hello@rfuenzalida.com) with Reserved Font Name \"Raleway\"" +} +# subsets: "cyrillic" # commented because italics do not support it yet +subsets: "latin" +subsets: "latin-ext" +subsets: "menu" diff --git a/theme/src/main/assets/fonts/Raleway-Black.ttf b/theme/src/main/assets/fonts/Raleway-Black.ttf new file mode 100644 index 0000000..6805f4f Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-Black.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-BlackItalic.ttf b/theme/src/main/assets/fonts/Raleway-BlackItalic.ttf new file mode 100644 index 0000000..2b2e65c Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-BlackItalic.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-Bold-Italic.ttf b/theme/src/main/assets/fonts/Raleway-Bold-Italic.ttf deleted file mode 100644 index 1d1c6dd..0000000 Binary files a/theme/src/main/assets/fonts/Raleway-Bold-Italic.ttf and /dev/null differ diff --git a/theme/src/main/assets/fonts/Raleway-Bold.ttf b/theme/src/main/assets/fonts/Raleway-Bold.ttf index 7aa37f0..38c099c 100644 Binary files a/theme/src/main/assets/fonts/Raleway-Bold.ttf and b/theme/src/main/assets/fonts/Raleway-Bold.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-BoldItalic.ttf b/theme/src/main/assets/fonts/Raleway-BoldItalic.ttf new file mode 100644 index 0000000..eac54e7 Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-BoldItalic.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-ExtraBold.ttf b/theme/src/main/assets/fonts/Raleway-ExtraBold.ttf new file mode 100644 index 0000000..502ff86 Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-ExtraBold.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-ExtraBoldItalic.ttf b/theme/src/main/assets/fonts/Raleway-ExtraBoldItalic.ttf new file mode 100644 index 0000000..09e0243 Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-ExtraBoldItalic.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-ExtraLight.ttf b/theme/src/main/assets/fonts/Raleway-ExtraLight.ttf new file mode 100644 index 0000000..7611e96 Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-ExtraLight.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-ExtraLightItalic.ttf b/theme/src/main/assets/fonts/Raleway-ExtraLightItalic.ttf new file mode 100644 index 0000000..3d07c1e Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-ExtraLightItalic.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-Italic.ttf b/theme/src/main/assets/fonts/Raleway-Italic.ttf new file mode 100644 index 0000000..237d88d Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-Italic.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-Light-Italic.ttf b/theme/src/main/assets/fonts/Raleway-Light-Italic.ttf deleted file mode 100644 index a064a4e..0000000 Binary files a/theme/src/main/assets/fonts/Raleway-Light-Italic.ttf and /dev/null differ diff --git a/theme/src/main/assets/fonts/Raleway-Light.ttf b/theme/src/main/assets/fonts/Raleway-Light.ttf index a947da3..91aa0c7 100644 Binary files a/theme/src/main/assets/fonts/Raleway-Light.ttf and b/theme/src/main/assets/fonts/Raleway-Light.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-LightItalic.ttf b/theme/src/main/assets/fonts/Raleway-LightItalic.ttf new file mode 100644 index 0000000..7ba0de8 Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-LightItalic.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-Medium.ttf b/theme/src/main/assets/fonts/Raleway-Medium.ttf new file mode 100644 index 0000000..7a71a6f Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-Medium.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-MediumItalic.ttf b/theme/src/main/assets/fonts/Raleway-MediumItalic.ttf new file mode 100644 index 0000000..43ed49a Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-MediumItalic.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-Regular-Italic.ttf b/theme/src/main/assets/fonts/Raleway-Regular-Italic.ttf deleted file mode 100644 index e46ac30..0000000 Binary files a/theme/src/main/assets/fonts/Raleway-Regular-Italic.ttf and /dev/null differ diff --git a/theme/src/main/assets/fonts/Raleway-Regular.ttf b/theme/src/main/assets/fonts/Raleway-Regular.ttf index c6ec2f0..e570a2d 100644 Binary files a/theme/src/main/assets/fonts/Raleway-Regular.ttf and b/theme/src/main/assets/fonts/Raleway-Regular.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-SemiBold.ttf b/theme/src/main/assets/fonts/Raleway-SemiBold.ttf new file mode 100644 index 0000000..ed0a8b9 Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-SemiBold.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-SemiBoldItalic.ttf b/theme/src/main/assets/fonts/Raleway-SemiBoldItalic.ttf new file mode 100644 index 0000000..36b7951 Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-SemiBoldItalic.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-Thin-Italic.ttf b/theme/src/main/assets/fonts/Raleway-Thin-Italic.ttf deleted file mode 100644 index c318827..0000000 Binary files a/theme/src/main/assets/fonts/Raleway-Thin-Italic.ttf and /dev/null differ diff --git a/theme/src/main/assets/fonts/Raleway-Thin.ttf b/theme/src/main/assets/fonts/Raleway-Thin.ttf index dcc9e4f..a497b98 100644 Binary files a/theme/src/main/assets/fonts/Raleway-Thin.ttf and b/theme/src/main/assets/fonts/Raleway-Thin.ttf differ diff --git a/theme/src/main/assets/fonts/Raleway-ThinItalic.ttf b/theme/src/main/assets/fonts/Raleway-ThinItalic.ttf new file mode 100644 index 0000000..38008b9 Binary files /dev/null and b/theme/src/main/assets/fonts/Raleway-ThinItalic.ttf differ diff --git a/theme/src/main/assets/fonts/fonts.xml b/theme/src/main/assets/fonts/fonts.xml index 8728949..a65cab0 100644 --- a/theme/src/main/assets/fonts/fonts.xml +++ b/theme/src/main/assets/fonts/fonts.xml @@ -1,39 +1,35 @@ - - - - sans-serif - arial - helvetica - tahoma - verdana - - - Raleway-Regular.ttf - Raleway-Bold.ttf - Raleway-Regular-Italic.ttf - Raleway-Bold-Italic.ttf - + + + + Raleway-Thin.ttf + Raleway-ThinItalic.ttf + Raleway-ExtraLight.ttf + Raleway-ExtraLightItalic.ttf + Raleway-Light.ttf + Raleway-LightItalic.ttf + Raleway-Regular.ttf + Raleway-Italic.ttf + Raleway-Medium.ttf + Raleway-MediumItalic.ttf + Raleway-SemiBold.ttf + Raleway-SemiBoldItalic.ttf + Raleway-Bold.ttf + Raleway-BoldItalic.ttf + Raleway-ExtraBold.ttf + Raleway-ExtraBoldItalic.ttf + Raleway-Black.ttf + Raleway-BlackItalic.ttf - - - sans-serif-light - - - Raleway-Light.ttf - Raleway-Light-Italic.ttf - - - - - - sans-serif-thin - - - Raleway-Thin.ttf - Raleway-Thin-Italic.ttf - - + + + + + + + + + \ No newline at end of file diff --git a/theme/src/main/res/values/strings.xml b/theme/src/main/res/values/strings.xml index 770301d..5c05a03 100644 --- a/theme/src/main/res/values/strings.xml +++ b/theme/src/main/res/values/strings.xml @@ -16,6 +16,6 @@ --> Raleway Font - Marcel Kapfer + Marcel Kapfer (mmk2410)