Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 0982bd2 + cad30ce commit 1c9d250438e8baf88905cea6ce9e0720fb14a21a @saperduper saperduper committed Jan 23, 2012
View
3 .classpath
@@ -6,5 +6,6 @@
<classpathentry kind="lib" path="lib/gson-1.7.1-javadoc.jar"/>
<classpathentry kind="lib" path="lib/gson-1.7.1-sources.jar"/>
<classpathentry kind="lib" path="lib/gson-1.7.1.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+ <classpathentry kind="output" path="bin/classes"/>
</classpath>
View
4 AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.fahimk.readabilityclient"
- android:versionCode="7"
- android:versionName="2.2" >
+ android:versionCode="8"
+ android:versionName="2.3" >
<uses-sdk android:minSdkVersion="7" />
View
792 assets/mobile.css
@@ -1,791 +1 @@
-/*** RESET CSS ***/
-/*
- html5doctor.com Reset Stylesheet (Eric Meyer's Reset Reloaded + HTML5 baseline)
- v1.4 2009-07-27 | Authors: Eric Meyer & Richard Clark
- html5doctor.com/html-5-reset-stylesheet/
-*/
-
-* {margin: 0; padding: 0;}
-
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code,
-del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var,
-b, i,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
- margin:0;
- padding:0;
- border:0;
- outline:0;
- font-size:100%;
- vertical-align:baseline;
- background:transparent;
-}
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
- display:block;
-}
-
-nav ul { list-style:none; }
-
-blockquote, q { quotes:none; }
-
-blockquote:before, blockquote:after,
-q:before, q:after { content:''; content:none; }
-
-a { margin:0; padding:0; font-size:100%; vertical-align:baseline; background:transparent; }
-
-ins { background-color:#ff9; color:#000; text-decoration:none; }
-
-mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; }
-
-del { text-decoration: line-through; }
-
-abbr[title], dfn[title] { border-bottom:1px dotted; cursor:help; }
-
-/* tables still need cellspacing="0" in the markup */
-table { border-collapse:collapse; border-spacing:0; }
-
-hr { display:block; height:1px; border:0; border-top:1px solid #ccc; margin:1em 0; padding:0; }
-
-input, select { vertical-align:middle; }
-
-small { font-size: 0.8em; }
-
-big { font-size: 1.2em; }
-
-
-
-/*** MOBILE SPECIFIC CSS ****/
-
-/* Mobile phones will adjust text size when the screen orientation changes unless you include a special CSS parameter */
-body {
- -webkit-text-size-adjust: none;
- -ms-text-size-adjust: none;
-}
-
-
-
-/*** GLOBAL STYLES ***/
-
-body, input, textarea, button, select {
- font-family: Georgia, 'Times New Roman', serif;
- font-size: 1em;
-}
-
-p {
- margin: 1em 0;
-}
-
-p, blockquote, .article-content div {line-height: 135%;}
-
-a, a:visited { text-decoration: none;color: #9c0001;}
-
-a:hover, a:active {color: #cd0001;}
-
-
-
-/*** GENERIC CLASSES ***/
-
-.hide { display: none; }
-
-.template { display: none; }
-
-/* Text overflow with ellipsis */
-.ellipsis {
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
-}
-
-.view {border-top:2px solid #a39f97}
-.article-view {border:none;}
-
-/*Form Stuff*/
-
-#form-login, #form-read {
- margin: .8em auto;
- padding: 0 2em 1em;
- width: 70%;
- -webkit-border-radius:7px;
- }
-
-label {color: #707065; text-align: left}
-
-#form-login label, #form-read label {display: block; padding-bottom: .1em}
-
-.fieldcontainer {margin-bottom: .5em}
-
-input[type="text"], input[type="password"], input[type="url"], input[type="search"], textarea {
- -webkit-box-shadow: 2px 2px 0 0 #F8F8F5 inset;
- box-shadow: 2px 2px 0 0 #F8F8F5 inset;
- background: #FFF;
- border-color: #BCBCB4 #E1E1DE #E1E1DE #BCBCB4;
- border-style: solid;
- border-width: 1px;
- font-size: 1.1em;
- padding: 0.4em 0.6em;
- width: 90%;
-}
-
-input#url[type="url"] {padding-left: 1.4em; width: 80%}
-#url-arrow {position: absolute; margin: 1.4em 0 0 0.85em}
-
-#form-login .button-chrome, #form-read .button-chrome {font-weight: bold}
-
-.button-chrome {
- -webkit-box-shadow: 0 1px 0 #E9E9E9;
- background: url(/media/images/mobile/bg_chrome.jpg) repeat-x;
- border-color: #BBBBBB #BBBBBB #999999;
- border-style: solid;
- border-width: 1px;
- color: #333333;
- font-size: 1.1em;
- padding: 0.4em 1.8em;
- border-radius:4px;
-}
-
-#form-read h2 {text-align: center; font-size:1.8em; font-weight: normal;}
-#form-read h2 span {color: #9C0000;}
-
-#form-read h3 {font-style: italic; font-weight: normal; color: #707065; text-align: center; margin-bottom: .85em; font-size:.85em; line-height: 130%}
-.submit-wrap {
- padding-top: .3em;
- background: #f3f3f3;
- display: inline-block;
- margin-top: 0.4em;
- padding: 0.3em;
-}
-
-.input-block {text-align: center}
-
-.submit-wrap, input[type="submit"] {-webkit-border-radius:3px;}
-
-ul.messages {line-height: 1.3em; font-style: italic; text-align: center; list-style-type: none;}
-ul.messages li.info {
- color: #333;
-}
-ul.messages li.warning {
- color: #933;
-}
-
-p#login-error {line-height: 1.3em; font-style: italic; color: red; text-align: center}
-
-ul.articles-list li.notification { display: none; }
-
-body.loading ul.articles-list li.articles-list-loading { display: block; }
-body.loading ul.articles-list li.articles-list-empty { display: none !important; }
-
-ul.articles-list li.notification p {text-align: center; font-style: italic}
-
-
-
-
-/*** CUSTOM CSS ***/
-
-/** Header & Top Nav **/
-
-header.global-header {
- width: 100%;
- background: #fafaf8 url(/media/images/mobile/bg_masthead.jpg) repeat-x;
-}
-
-header.global-header h1 {
- text-align: center;
- height: 2.6em;
- line-height: 2.6em;
-}
-
-header.global-header h1 img {
- max-width: 130px;
- vertical-align: middle;
-}
-
-.nav-icon {
- border-width:1px;
- border-style: solid;
- border-color: #c2c0bc #c2c0bc #bebcb9;
- margin:.5em 0 0 .5em;
- display: block;
- -webkit-border-radius:3px;
- padding: .35em .5em .03em;
- }
-
-header.global-header .nav-icon {background: #e7e6e2 url(/media/images/mobile/bg_read_nav.jpg) repeat-x}
-
-
-#reading-list-nav li {
- float: left;
- list-style: none;
- position: absolute
- }
-
-#reading-list-nav li#icon-reload {left:2.4em;}
-#reading-list-nav li#add-button {float: right; margin-right: .5em; right: 0}
-
-
-
-/** Nav **/
-
-ul#tabs {
- background: #E7E6E2 url(/media/images/mobile/bg_sorting.jpg) repeat-x;
- padding: .6em 0 0;
- overflow: hidden;
- text-align: center;
- list-style: none;
- border-bottom: 4px solid #FFF;
-}
-
-#tabs li {
- display: inline;
- font-weight: bold;
-}
-
-#tabs li a {
- display: inline-block;
- text-align: center;
- color: #62605D;
- padding: 0.5em .95em;
- font-size:.9em;
- background: url(/media/images/mobile/bg_tab.png) repeat-x center bottom #F2F1EF;
-}
-
-#tabs li a.active {
- background: #FFF;
- color: #111;
-}
-
-.nav-icon.articles-add-cancel {
- position: absolute;
- right: 0.5em;
- top: 0.15em;
- border-color: #3c1414;
- background: #bf0101 url(/media/images/mobile/bg_cancel.png) repeat-x
-}
-
-
-/** Articles List **/
-
-ul.articles-list li a {
- display: block;
- background-color: #FFF;
- padding: 0 1em 1em;
- border-bottom: 1px solid #cacaca;
-}
-
-ul.articles-list li h3 {
- padding: 0;
- margin: 0;
- color: #111;
- line-height: 120%;
- font-size:1.2em
-}
-
-ul.articles-list li p.article-domain {
- margin: 0;
- font-size: 0.85em;
- padding: 1.1em 0 .2em;
-}
-
-ul.articles-list li p.article-blurb {
- margin: .3em 0 0 0;
- color: #111;
- font-size: 1em;
- line-height: 135%;
-}
-
-div.articles-add-flyout {
- display: none;
- position: absolute;
- top: 0;
- width: 100%;
- padding-bottom: .8em;
-}
-
-div.articles-add-flyout h2 {
- text-align: center;
- margin: .8em 0 .6em;
- font-size:1.2em
-}
-
-input.add-url[type="url"] {
- border:1px solid #000;
- box-shadow:none;
- width: 12em;
- height: 1.1em;
- padding: .3em .2em;
- border-right:0;
- }
-
-#add-url-box {
- background: url(/media/images/mobile/bg_addurl.png);
- width: 90%;
- margin: 0 auto;
- padding: .5em .2em;
- text-align: center;
- -webkit-border-radius:4px;}
-
-#add-url-box .button-chrome {
- -webkit-box-shadow:none;
- border-color: #000;
- color: #111;
- font-size:.9em;
- height: 1.35em;
- line-height: 1.4em;
- display: inline-block;
- padding: .4em .8em;
- vertical-align: top;
- border-bottom-left-radius:0;
- border-top-left-radius:0;
- margin-left: -.3em;
- }
-
-
-
-/** Article View **/
-
-article.article {
- padding-top: 1em;
- border: 1px solid transparent; /* Hack to get the white bottom border to disappear */
-}
-
-article.article a.article-url-link {
- font-size: 0.9em;
-}
-
-article.article a.article-url img {
- margin-right: 0.3em;
- vertical-align: middle;
-}
-
-article.article div.article-meta {
- font-size: 0.8em;
- text-transform: uppercase;
- letter-spacing: .09em;
- margin-bottom: 1em;
-}
-
-article.article div.article-meta .article-byline em {
- text-transform: lowercase;
-}
-
-
-
-/* Article Nav */
-
-article.article nav.article-nav {
- position: absolute;
- width: 100%;
- top: 0;
- display: none;
- background: url(/media/images/mobile/bg_pulldown.png);
- border-top: 1px solid #000;
-}
-
-.article-nav div {
- text-indent: -999em;
- margin: 0 auto;
- width: 18px;
- height: 18px;
- background: url(/media/images/mobile/icons-18-white.png) no-repeat;
- opacity: .7;
- }
-
-#icon-back {background-position-x: -144px;}
-#icon-favorite {background-position-x: -468px}
-#icon-archive {background-position-x: -252px}
-#icon-styles {background-position-x: -288px}
-#icon-share {background-position-x: -432px}
-
-nav.article-nav {
- display: table;
- width: 100%;
-}
-
-nav.article-nav ul {
- display: table-row;
-}
-
-nav.article-nav ul li {
- display: table-cell;
- width: 20%;
- font-weight: bold;
- border-top: 1px solid #7b7b7b;
-}
-
-nav.article-nav ul li a {
- display: block;
- text-align: center;
- color: #FFF;
- font-size:.75em;
- font-weight: bold;
- text-shadow: 0 -1px 0 rgba(0,0,0,1);
- background: url(/media/images/mobile/bg_article_nav.png) repeat-x bottom;
- border-left: 1px solid #000;
-}
-
-nav.article-nav ul li a.active {
- background: #5f6708
-}
-
-article.article nav.article-nav a {
- padding: .4em 0 .6em;
- text-shadow: 0 -1px 0 rgba(0,0,0,.8);
-}
-
-
-/*Share*/
-.article-share, #menu-tip {
- display: none;
- position: absolute;
- top: 0; /* Gets set automatically via JS */
- width: 12em;
- left: 50%;
- margin-left: -6em;
- border-radius: 6px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- color: white;
- text-align: center;
- padding: .8em .4em 1.1em;
- background: url(/media/images/mobile/bg_pulldown.png);
- text-shadow: 0 -1px 0 rgba(0,0,0,1);
-}
-
-#menu-tip {top: 40%; padding: 1.1em .8em 1.1em; margin-left: -6.7em;}
-#menu-tip strong {color: #d0e021;}
-#menu-tip img {position: absolute;z-index: 1; margin: -2em 0 0 4.9em;}
-#menu-tip p {margin: .7em 0 0 0;}
-
-.article-share h3 {font-size:1.3em}
-
-#share-links-list {overflow: hidden; list-style: none; text-align: center; margin-top: .6em}
-#share-links-list li {display: inline; margin:0 .4em}
-#share-links-list a {text-indent: -99em; display: inline-block; width: 44px; height: 44px;}
-
-.email-link {background: url(/media/images/mobile/icon_email.png);}
-.facebook-link {background: url(/media/images/mobile/icon_facebook.png);}
-.twitter-link {background: url(/media/images/mobile/icon_twitter.png);}
-
-
-
-
-
-/* Article Styles */
-
-article.article div.article-styles {
- display: none;
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- text-align: center;
- padding: .8em .4em;
- font-family: Georgia, "Times New Roman", serif !important;
-}
-
-.article-styles a {color: #FFF !important;}
-
-.article-styles .button-chrome {
- -webkit-box-shadow: 0 1px 0 #686868;
- border-color: #111;
- background: url(/media/images/mobile/bg_btn_pulldown.jpg) repeat-x;
- font-weight: bold;
- text-shadow: 0 -1px 0 #000;
- }
-
-.disabled {opacity: .3}
-
-div.articles-add-flyout, article.article div.article-styles {
- background: url(/media/images/mobile/bg_pulldown.png);
- border-bottom: 3px solid #000;
- color: #FFF;
- }
-
-.switcher-group.steppers {
- display: block;
- line-height: 3em;
- height: 3em;
- }
-
-article.article div.article-styles div.steppers div.switcher {
- width: 48.3%;
- float: left;
-}
-
-article.article div.article-styles div.switcher-group div.switcher a.step {
- padding: 0 0.5em;
- display: inline-block;
- width: 30%;
- line-height: 2.4em;
- height: 2.4em;
-}
-
-article.article div.article-styles div.switcher-group div.switcher a.previous {
- border-radius: 6px 0 0 6px;
-}
-
-article.article div.article-styles div.switcher-group div.switcher a.next {
- border-radius: 0 6px 6px 0;
- border-left: none;
-}
-
-article.article div.article-styles div.switcher-group div.styler {
- display: block;
- text-align: center;
- width: 100%;
-}
-
-article.article div.styler a.switch-link {
- padding: 0 0.5em;
- width: .9em;
- line-height: 150%;
-}
-
-div.styler a {
- border: none;
- background: url(/media/images/mobile/bg_btn_pulldown.jpg) repeat-x;
- border: 1px solid #000;
- font-size:1.3em;
- font-weight: bold;
- display: inline-block;
- border-left: 1px solid #000 !important;
- -webkit-box-shadow: 0 1px 0 #686868;
- height: 1.6em
-}
-
-article.article div.styler span.current {
- text-align: center;
- color: #FFF;
- width: 8.2em;
- display: inline-block;
- font-weight: bold;
-}
-
-#switcher-wrap {
- background: #494949;
- border-radius:6px;
- display: inline-block;
- margin-top: .7em;
- padding: .3em .4em;
- border: 1px solid #1c1c1c;}
-
-.article-content, .article-header {
- margin: 0 auto;
-}
-
-hr.flourishes {
- height: 18px;
- margin: 12px 0 0;
- background: url("http://www.readability.com/media/images/flourishes.png") no-repeat scroll center -61px transparent;
- border: 0 none;
- opacity: 0.2;
- outline: 0 none;
- text-indent: -9000px;
- clear: both;
- display: block;
- font-size: 1em;
- line-height: 1.4375em;
-}
-
-.article hr.flourishes {width: 85%; margin: 0 auto}
-
-p#article-marketing {
- font-size: 0.9em;
- font-style: italic;
- text-align: center;
- line-height: 1.2em;
- margin: .2em 0 0;
- padding: 0 0 1em;
- }
-
-#article-marketing img {
- display: inline-block;
- margin: 0 0.2em 0.2em;
- vertical-align: middle;
-}
-
-a.main-link, a.main-link:visited {border-bottom: 1px solid #C7C7C7;}
-a.main-link:hover, a.main-link:active {border-bottom: 1px solid #8e8e8e;}
-
-.article-content img{max-width:100%; position: static}
-.article-content img.blockImage{clear:both;float:none;display:block;margin-left:auto;margin-right:auto}
-.article-content img.leftImage{float:left;margin:.4em 1.4375em .5em 0; clear: left;}
-
-
-
-/*** Themes ***/
-
-/* Sizes
-x-small: 12pt
-small: 14pt
-medium: 16pt
-large: 18pt
-x-large: 24pt
-*/
-
-/*Type Size*/
-.article.mobile-size-x-small .article-content, .article.mobile-size-x-small .article-header { font-size: 0.85em; }
-.article.mobile-size-small .article-content, .article.mobile-size-small .article-header { font-size: 1em; }
-.article.mobile-size-medium .article-content, .article.mobile-size-medium .article-header { font-size: 1.15em; }
-.article.mobile-size-large .article-content, .article.mobile-size-large .article-header { font-size: 1.3em; }
-.article.mobile-size-x-large .article-content, .article.mobile-size-x-large .article-header { font-size: 1.5em; }
-
-/* Widths */
-.article.mobile-col-x-narrow .article-content, .article.mobile-col-x-narrow .article-header { width: 60%; }
-.article.mobile-col-narrow .article-content, .article.mobile-col-narrow .article-header { width: 70%; }
-.article.mobile-col-medium .article-content, .article.mobile-col-medium .article-header { width: 80%; }
-.article.mobile-col-wide .article-content, .article.mobile-col-wide .article-header { width: 90%; }
-.article.mobile-col-x-wide .article-content, .article.mobile-col-x-wide .article-header { width: 100%; }
-
- /* Globals */
-.article-url {font-size : .9em; text-decoration : none; font-weight: normal;}
-.article h1 {
- font-size: 1em;
- font-weight: bold;
- padding-bottom: 0.5em;
- margin: 0.2em 0 0.67em;
- border-width:0 0 2px;
- border-style: solid;
- border-color: #CDCDCC;
- line-height: 120%;
-}
-
-.article-meta { font-size : .8em;}
-.article a { text-decoration : none; }
-
-.article p {margin: 1.2em 0;}
-.article li {margin-left: 5em; line-height: 1.35em;}
-
-.article-content blockquote {margin: 1.2em 2.2em;}
-
- /* Newspaper */
-.mobile-style-newspaper { background: #FBFBFB; color: #080000; font-family: Georgia, "Times New Roman", serif; }
-.mobile-style-newspaper .article-meta { color : #707065; }
-.mobile-style-newspaper a { color : #9c0001;}
-.mobile-style-newspaper .article-url { color : #9c0001;}
-
- /* Novel */
-.mobile-style-novel { background: #F4EED9; color: #1d1916; font-family: Georgia, "Times New Roman", serif;}
-.mobile-style-novel h1 { border-color: #D1CCB8}
-.mobile-style-novel .article-meta { color: #707070}
-.mobile-style-novel a { color : #746A45;}
-.mobile-style-novel .article-url {color : #746a45;}
-
- /* Ebook */
-.mobile-style-ebook { background: #edebe8; color : #2c2d32; font-family : 'Helvetica Neue',Arial,sans-serif; }
-.mobile-style-ebook h1 { border-color : #CDCDCC}
-.mobile-style-ebook .article-meta { color : #838178; }
-.mobile-style-ebook a { color : #456695;}
-.mobile-style-ebook .article-url {color : #456695; }
-
- /* Inverse */
-.mobile-style-inverse { background: #343a3f; color : #d6dbdf; font-family : 'Helvetica Neue',Arial,sans-serif; }
-.mobile-style-inverse h1 { border-color: #4E5358; }
-.mobile-style-inverse .article-meta { color : #a6b5c2; }
-.mobile-style-inverse a { color : #2FC2EF;}
-.mobile-style-inverse .article-url {color : #2FC2EF;}
-.mobile-style-inverse hr.flourishes {background-position: 0 -85px;}
-
- /* Athelas */
-.mobile-style-athelas { background: #f7f7f7; color : #2B373D; font-family : "athelas-1","athelas-2", Georgia, serif}
-.mobile-style-athelas h1 { border-color : #CDCDCC}
-.mobile-style-athelas .article-meta { color : #707065; }
-.mobile-style-athelas a { color : #1E83CB;}
-.mobile-style-athelas .article-url {color : #1E83CB; font-size : .9em;}
-
-
-
-
-
-
-/** Footer **/
-
-footer.global-footer {
- width: 100%;
- border-bottom: 3px solid #CCC;
- background-color: #EFEFEF;
-}
-
-footer.global-footer a {
- display: block;
- margin: 0 auto;
- height: 3em;
- line-height: 3em;
- text-align: center;
-}
-
-#footer-anon {overflow: hidden; text-align: center; padding:.4em 0 1em; border-top: 3px double #dbdad8; width: 75%; margin: 0 auto;}
-#footer-anon li {
- list-style: none;
- display: inline;
- background: url(https://www.readability.com/media/images/diamond.png) no-repeat right 6px;
- padding:0 1em 0 .4em;
- font-size:.9em
- }
-#footer-anon li.last {padding-right: 0; background: none;}
-
-
-
-/*Tablet Stuff*/
-
-@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
-
-body, input, textarea, button, select {
- font-family: 'minion-pro-1', 'minion-pro-2', Palatino, Georgia, 'Times New Roman', serif;
-}
-
-
-header.global-header h1 {line-height: 3em; height: 3.4em;}
-header.global-header h1 img {max-width: 180px; margin-top: .4em}
-.nav-icon {padding:0.5em .8em .1em; line-height: 1.7em}
-#reading-list-nav li#icon-reload {left: 3em}
-p.articles-list-empty {font-size:1.3em;}
-
-#form-login, #form-read, #footer-anon {width: 20em}
-input#url[type="url"] {width:90%}
-
-#add-url-box {width: 30em;}
-input.add-url[type="url"] {width: 20em;}
-
-ul.articles-list li p.article-domain {font-size:1.1em; line-height: .5em}
-ul.articles-list li h3 {font-size:1.5em; margin: .2em 0 .1em}
-article.article h1 {margin-top: .2em; padding-bottom: .4em; line-height: 110%;}
-ul.articles-list li p.article-domain {padding: 1.1em 0 0; margin-bottom: .2em;}
-ul.articles-list li p.article-blurb {font-size:1.1em;}
-ul.articles-list li a {padding: 0 1.8em 1.2em }
-
-ul#tabs {padding-top: .8em}
-#tabs li a {font-size:1.2em; padding: 0.6em 1.9em;}
-
-article.article nav.article-nav a {padding: .5em 0 .8em; font-size:1.1em}
-article.article h1 {font-size:1.5em;}
-
-.article hr.flourishes {width: 90%;}
-p#article-marketing {font-size:1.1em}
-
-article.article div.article-share {width:16em; margin-left: -8em; padding: 2em}
-
-
-/*Type Style*/
-.mobile-style-newspaper {font-family: 'minion-pro-1', 'minion-pro-2', Palatino, Georgia, 'Times New Roman', serif;}
-
-
-/*Type Size*/
-.article.mobile-size-x-small .article-content, .article.mobile-size-x-small .article-header { font-size: 1.15em; }
-.article.mobile-size-small .article-content, .article.mobile-size-small .article-header { font-size: 1.3em; }
-.article.mobile-size-medium .article-content, .article.mobile-size-medium .article-header { font-size: 1.45em; }
-.article.mobile-size-large .article-content, .article.mobile-size-large .article-header { font-size: 1.6em; }
-.article.mobile-size-x-large .article-content, .article.mobile-size-x-large .article-header { font-size: 1.75em; }
-
-
-}
-
-
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote::before,blockquote::after,q::before,q::after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}body{background:#3a3a3a url('/media/images/mobile/bg-waves.png') repeat 0 0;font-family:Georgia,Palatino,'Times New Roman',serif;text-rendering:optimizeLegibility;-webkit-font-smoothing:subpixel-antialiased;font-smooth:always;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;text-size-adjust:100%}h1{padding:.313em 0 .469em;font-size:1.5em}h2{padding:.6em 0;font-size:1.333em;line-height:1.5em}h3{padding:1.518em 0;font-size:1.167em}p,.errorlist li,#rdb-article-content li,#rdb-article-content div,dl{margin:0 0 .925em;line-height:1.35em}dd{margin:0 0 .925em}sub,sup{font-size:.75em;line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}small{font-size:.833em}big{font-size:1.167em}em,i{font-style:italic}strong,b{font-weight:700}a,a:link,a:visited{color:#9c0001;text-decoration:none}a:active,a:focus{color:#cd0001}*[aria-hidden=true],body[data-online=false] #rdb-article img,body[data-online=false] #rdb-articles-list img{display:none!important;visibility:hidden!important}hr{border:0;clear:both;height:16px;margin:0 10% .625em;background:transparent url('/media/images/mobile/flourishes.png') no-repeat center center;outline:0}.loading{background:transparent url('/media/images/mobile/loading.gif') no-repeat 0 1px;padding-left:1.25em}.disabled{opacity:.3}.download-itunes{display:inline-block;height:56px;width:160px;background:transparent url('/media/images/mobile/appstore-soon.png') no-repeat 0 0;text-indent:-1000em}#marketing-devices{display:block;height:197px;margin:0;width:230px;background:transparent url('/media/images/mobile/marketing-bigscreen.png') no-repeat center 0;text-indent:-1000em}body.ios #marketing-devices{background:transparent url('/media/images/mobile/marketing-bigscreen-ios.png') no-repeat center 0}.tab-block,#rdb-home-nav{border:1px solid #dcd9d5;max-width:14.375em;margin:0 auto 1.5em;padding:.625em 1.625em 1em;background-color:#fff;-webkit-box-shadow:0 0 0 4px #fff;box-shadow:0 0 0 4px #fff}.tab-block h3{padding-top:.625em}.tab-block h3 span{color:#9c0000}.tab-block label{display:block;text-align:left}.tab-block input[type=submit]{padding-right:0;padding-left:0;width:100%}.tab-block small{font-style:italic;color:#707065}.tab-block dt{font-weight:700}input,button,textarea,.button-chrome{border-width:1px;display:block;padding:.6em .625em;width:13em;background-clip:padding-box!important;border-color:#bcbcb4 #e1e1de #e1e1de #bcbcb4;border-style:solid;font-family:Georgia,'Times New Roman',serif;font-size:1em}input[type=submit],.button-chrome{border-width:0 0 2px;display:inline-block;margin-top:.625em;padding:.313em 1em .25em;width:12em;background-color:#889135;background-image:-webkit-gradient(linear,left top,left bottom,from(#a3ab4f),to(#6e771c));background-image:-webkit-linear-gradient(top,#a3ab4f,#6e771c);background-image:linear-gradient(top,#a3ab4f,#6e771c);border-color:#4c5213;border-style:solid;border-radius:.313em;-webkit-box-shadow:0 0 2px rgba(17,17,17,0.85) inset;box-shadow:0 0 2px rgba(17,17,17,0.85) inset;color:#fff;font-size:1.167em;font-weight:700;line-height:1.6em;letter-spacing:.03em;-webkit-tap-highlight-color:#6e771c;text-shadow:0 -1px rgba(32,32,32,0.4)}.button-chrome:visited,.button-chrome:active{color:#fff}input[type=submit].gray,.button-chrome.gray{background-color:#898989;background-image:-webkit-gradient(linear,left top,left bottom,from(#898989),to(#323232));background-image:-webkit-linear-gradient(top,#898989,#323232);background-image:linear-gradient(top,#898989,#323232);-webkit-tap-highlight-color:#323232}.errorlist{font-style:italic;font-size:.833em;text-align:left;margin:-.469em 0 1.3em}.errorlist .info{color:#093!important}.errorlist .warning{color:#f30!important}.errorlist li,.errorlist .error{color:#d22!important}#rdb-application,#rdb-home{clear:both}#rdb-footer{border-top:2px solid rgba(23,23,23,0.4);clear:both;display:block;padding:.625em 0 .8em;color:#979797;letter-spacing:.063em;text-align:center}#rdb-footer a{color:#c4ced9}#rdb-footer ul{font-size:.833em;text-transform:uppercase}#rdb-footer li{display:inline}#rdb-footer li:nth-child(2)::before{margin-right:.5em;content:"\2022"}#rdb-footer li:nth-child(2)::after{margin-left:.5em;content:"\2022"}#rdb-footer-marketing{margin:1em auto}#rdb-home{min-height:18.469em;padding:1em 0 1.5em;background:#f8f7f4;text-align:center}#logo-home{display:block;margin:.234em auto .625em;padding:0;width:184px}#logo-home a{display:block;height:33px;width:184px;background:transparent url('/media/images/mobile/readability-logo.png') no-repeat 0 0;text-indent:-1000em}#rdb-home h2{line-height:1em}#rdb-home h2 small{display:block;font-size:.75em}#rdb-home-nav{max-width:17.625em;padding:0}#rdb-home-nav a{border-bottom:1px solid #dcd9d5;display:block;padding:.625em 1.625em;background:#fff;color:#707065}#rdb-home-nav .active{color:#333;font-weight:700}#rdb-home-nav li:last-child a{border-bottom-width:0}#intro a{border-bottom:1px dashed #c7c7c7}#forgot-pw a{color:#707065;font-size:.833em}#tab-block-forgotpass-complete{background-color:#f6fbdc;border-color:#c7d06d;-webkit-box-shadow:0 0 0 4px #f6fbdc;box-shadow:0 0 0 4px #f6fbdc}#tab-block-forgotpass-complete img{margin:0 auto;position:relative;top:-1.5em}#rdb-header{border-bottom:1px solid #b0b0ab;clear:both;display:none;overflow:visible;position:absolute;top:0;width:100%;z-index:100;background-color:#f5f4f2;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#eceae6));background-image:-webkit-linear-gradient(top,#fff,#eceae6);background-image:linear-gradient(top,#fff,#eceae6)}.ios #rdb-header[data-floating=true]{-webkit-box-shadow:0 0 4px #7f7f7f;box-shadow:0 0 4px #7f7f7f}#rdb-actions{clear:both;display:block;height:44px;position:relative}#rdb-actions>li{border-left:1px solid #c8c7c5;display:inline-block;float:right}#rdb-actions>li.active{background:#3a3a3a url('/media/images/mobile/bg-waves.png') repeat 0 0}#rdb-actions>li>a{display:block;height:44px;width:63px;z-index:10;background:transparent url('/media/images/mobile/sprite-rdb-actions.png') no-repeat 0 0;text-indent:-1000em;-webkit-tap-highlight-color:#eceae6}#rdb-actions #nav-home{border-left:0;float:none}#rdb-actions #nav-favorite.active,#rdb-actions #nav-archive.active,#single-article #rdb-actions #nav-add-article.active{background-color:#eceae6;background-image:-webkit-gradient(linear,left top,left bottom,from(#eceae6),to(#fff));background-image:-webkit-linear-gradient(top,#eceae6,#fff);background-image:linear-gradient(top,#eceae6,#fff)}#rdb-actions #nav-home>a,#rdb-actions #nav-home>a:active,#rdb-actions #nav-home>a:focus{width:128px;background-position:16px 6px}#application.mobile[data-current-view=article] #rdb-actions #nav-home>a{width:64px;background-position:16px -26px}#application.mobile[data-current-view=article] #rdb-actions #nav-home>a:active,#application.mobile[data-current-view=article] #rdb-actions #nav-home>a:focus{width:64px;background-position:-48px -26px}#rdb-actions #nav-favorite>a{background-position:15px -59px}#rdb-actions #nav-favorite.active>a{background-position:-49px -59px}#rdb-actions #nav-archive>a{background-position:16px -90px}#rdb-actions #nav-archive.active>a{background-position:-48px -90px}#rdb-actions #nav-add-article>a{background-position:16px -122px}#rdb-actions #nav-add-article.active>a{background-position:-48px -122px}#application #rdb-actions #nav-add-article>a{background-position:16px -154px}#application #rdb-actions #nav-add-article.active>a{background-position:-48px -154px}#rdb-actions #nav-settings>a{background-position:16px -186px}#rdb-actions #nav-settings.active>a{background-position:-48px -186px}#rdb-actions #nav-share>a{background-position:17px -218px}#rdb-actions #nav-share.active>a{background-position:-47px -218px}#rdb-actions #nav-refresh>a{background-position:15px -249px}#rdb-actions #nav-refresh>a:active,#rdb-actions #nav-refresh>a:focus{background-position:-49px -249px}#rdb-actions #nav-user>a{background-position:15px -314px}#rdb-menu-restrictor{position:absolute;width:100%;z-index:50}#rdb-actions ul{border-bottom:2px solid #232323;display:block;left:0;position:absolute;top:44px;width:100%;background:#3a3a3a url('/media/images/mobile/bg-waves.png') repeat 0 0;z-index:100;text-align:center}#rdb-actions ul a{color:#fff}#rdb-actions ul>li{display:inline-block;margin:.625em .469em}#rdb-actions .menu-help{color:#9e9e9e;line-height:1.35em}#rdb-actions #nav-user-menu>li,#rdb-actions #nav-add-article-menu>li{display:block;margin-left:1em;margin-right:1em}#nav-user-menu a{display:block;margin:.213em;padding:.75em .625em;background:#505050 none;border-radius:.313em;text-align:left}#add-to-reading-list{display:inline-block;margin:0;width:11em;border-radius:.313em 0 0 .313em}#add-article-submit{border-width:0 0 1px;display:inline-block;margin:0;padding:.714em .714em .5em;width:auto;border-radius:0 .313em .313em 0;font-size:.875em}#nav-settings-menu .button-chrome{border:1px solid #111;margin-top:0;padding:.5em 0 .714em;width:3.25em;-webkit-box-shadow:none;box-shadow:none;height:19px;font-size:1em;vertical-align:top}#nav-settings-menu .previous{border-radius:.313em 0 0 .313em}#nav-settings-menu .next{border-left:0;border-radius:0 .313em .313em 0}#settings-style .button-chrome,#settings-margin .button-chrome{padding-top:.563em;padding-bottom:.625em}#theme-next,#settings-margin span{display:inline-block;height:16px;width:26px;background:transparent url('/media/images/mobile/sprite-rdb-submenus.png') no-repeat center -132px;text-indent:-1000em}#theme-next{background-position:center -172px}#settings-margin .previous span{width:14px}#theme-name-wrap{left:50%;margin:0 auto 0 -7.25em;padding:.833em 0;position:absolute;top:8em;width:14.5em;background-color:rgba(17,17,17,0.85);border-radius:.313em;color:#9e9e9e;line-height:1.35em}#theme-name-wrap span{color:#fff;font-size:1.167em;font-weight:700}#nav-share-menu .button-chrome{border:1px solid #111;margin-top:0;padding-right:0;padding-left:0;width:4.5em;-webkit-box-shadow:none;box-shadow:none}#nav-share-menu span{display:inline-block;height:24px;width:40px;background:transparent url('/media/images/mobile/sprite-rdb-submenus.png') no-repeat center 0;text-indent:-1000em}#nav-share-facebook a{background-color:#2a4885;background-image:-webkit-gradient(linear,left top,left bottom,from(#3e63a2),to(#172e69));background-image:-webkit-linear-gradient(top,#3e63a2,#172e69);background-image:linear-gradient(top,#3e63a2,#172e69)}#nav-share-facebook span{background-position:center -6px}#nav-share-email a{background-color:#3873d5;background-image:-webkit-gradient(linear,left top,left bottom,from(#5585e5),to(#1b61c6));background-image:-webkit-linear-gradient(top,#5585e5,#1b61c6);background-image:linear-gradient(top,#5585e5,#1b61c6)}#nav-share-email span{background-position:center -47px}#nav-share-twitter a{background-color:#30a8d8;background-image:-webkit-gradient(linear,left top,left bottom,from(#44c8fe),to(#1d88b3));background-image:-webkit-linear-gradient(top,#44c8fe,#1d88b3);background-image:linear-gradient(top,#44c8fe,#1d88b3)}#nav-share-twitter span{background-position:center -86px}#rdb-banner{border-top:1px solid #fafafa;border-bottom:1px dashed #b1b1b1;display:block;padding:.469em 1em;background:#ececec;color:rgba(0,0,0,0.85);text-align:center}#application[data-current-view=article] #rdb-banner{display:none!important;visibility:hidden!important}#rdb-banner.error{background:#ffebe8;border-color:#fdf3f1 #c00 #c00}#rdb-banner.info,#rdb-banner.offline{background:#eff5fc;border-color:#f2f6fc #c4ced9 #c4ced9}#rdb-banner.success{background:#f6fbdc;border-color:#f5f9e0 #c7d06d #c7d06d}#rdb-messages{display:block;min-height:18.469em;overflow:hidden;padding:1.25em;background:#eceae6;text-align:center}#rdb-messages.inline{min-height:0}#rdb-messages strong{padding:1.518em 0;font-size:1.167em}#rdb-articles-nav{border-top:1px solid #cfcfca;border-bottom:1px solid #aaaaa8;margin-top:45px;overflow:hidden;padding:.5em .625em;background-color:#d9d9d2;background-image:-webkit-gradient(linear,left top,left bottom,from(#e0e0da),to(#d2d2cb));background-image:-webkit-linear-gradient(top,#e0e0da,#d2d2cb);background-image:linear-gradient(top,#e0e0da,#d2d2cb);text-align:center}#rdb-articles-nav li{display:inline}#rdb-articles-nav a{display:inline-block;padding:.25em .625em .313em;line-height:1em;border-radius:1em;color:#545450;text-transform:uppercase;-webkit-tap-highlight-color:#81817a}#rdb-articles-nav .active a{background:#81817a;-webkit-box-shadow:-1px -1px 1px #5a5a55;box-shadow:-1px -1px 1px #5a5a55;color:#eaeae7}#rdb-articles{background:#fff}#rdb-articles-list{min-height:20.969em}#rdb-articles-list>li{border-bottom:1px solid #cacaca;position:relative;background-color:#3c3c3c;list-style-type:none}#rdb-articles-list p{margin:0}#rdb-articles-list .rdb-article-link{display:block;padding:1em 1.25em 1.25em;background-color:#fff;-webkit-tap-highlight-color:#eceae6;z-index:10}#rdb-articles-list .article-domain img{margin:.313em .313em 0 0;vertical-align:top}#rdb-articles-list .article-title strong{color:#111;font-size:.833em}#rdb-articles-list .article-excerpt{color:#222}#rdb-article{padding:4.187em 0}#rdb-article article{margin:0 auto}#rdb-article-header{padding-bottom:1.25em}#rdb-article-original-url img{margin:.115em .313em 0 0;vertical-align:top}#rdb-article-title{border-bottom:2px solid #e6e6e6}#rdb-article-meta{display:block;margin-top:.625em;text-transform:uppercase;letter-spacing:.09em}#rdb-article-meta em{text-transform:lowercase}#rdb-article-content a{text-decoration:underline}#rdb-article-content li{margin-left:1.25em}#rdb-article-content blockquote{margin:0 1.25em .625em;font-style:italic}#rdb-article-content img{display:block;margin:1em auto;max-width:100%}#rdb-article-marketing{display:none;margin:0 auto .925em!important;overflow:auto;padding:0 1em;text-align:center}#rdb-article-marketing #marketing-devices{display:inline;float:left;height:112px;margin-right:1em;width:80px;background:transparent url('/media/images/mobile/marketing-smallscreen.png') no-repeat center 0}body.ios #rdb-article-marketing #marketing-devices{background:transparent url('/media/images/mobile/marketing-smallscreen-ios.png') no-repeat center 0}#rdb-article-marketing strong{font-style:normal}#rdb-article-marketing .button-chrome{display:inline-block;width:auto;white-space:nowrap;color:#fff!important}#rdb-article-fail header{padding-bottom:1.25em}#rdb-article-fail header h3{border-bottom:2px solid #e6e6e6}#rdb-article.mobile-size-x-small article{font-size:.75em}#rdb-article.mobile-size-small article{font-size:.833em}#rdb-article,#rdb-article.mobile-size-medium article{font-size:1em}#rdb-article.mobile-size-large article{font-size:1.25em}#rdb-article.mobile-size-x-large article{font-size:1.5em}#rdb-article.mobile-col-x-narrow article{width:60%}#rdb-article.mobile-col-narrow article{width:70%}#rdb-article article,#rdb-article.mobile-col-medium article{width:80%}#rdb-article.mobile-col-wide article{width:90%}#rdb-article.mobile-col-x-wide article{width:98%}#rdb-article,#rdb-article.mobile-style-newspaper{background:#fbfbfb;color:#080000}#rdb-article #rdb-article-meta,#rdb-article.mobile-style-newspaper #rdb-article-meta{color:#707065}#rdb-article a,#rdb-article.mobile-style-newspaper a{color:#9c0001;-webkit-tap-highlight-color:#9c0001}body[data-online=false] #rdb-article a,body[data-online=false] #rdb-article.mobile-style-newspaper a{color:#520000;-webkit-tap-highlight-color:#520000}#rdb-article.mobile-style-novel{background:#f4eed9;color:#1d1916;font-family:'Hoefler Text',Georgia,'Times New Roman',serif}#rdb-article.mobile-style-novel h1{border-color:#d1ccb8}#rdb-article.mobile-style-novel #rdb-article-meta{color:#707070}#rdb-article.mobile-style-novel a{color:#9c0001;-webkit-tap-highlight-color:#9c0001}body[data-online=false] #rdb-article.mobile-style-novel a{color:#5c0d0c;-webkit-tap-highlight-color:#5c0d0c}#rdb-article.mobile-style-ebook{background:#edebe8;color:#2c2d32;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif}#rdb-article.mobile-style-ebook h1{border-color:#cdcdcc}#rdb-article.mobile-style-ebook #rdb-article-meta{color:#838178}#rdb-article.mobile-style-ebook a{color:#456695;-webkit-tap-highlight-color:#456695}body[data-online=false] #rdb-article.mobile-style-ebook a{color:#384963;-webkit-tap-highlight-color:#384963}#rdb-article.mobile-style-inverse{background:#343a3f;color:#d6dbdf;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif}#rdb-article.mobile-style-inverse h1{border-color:#4e5358}#rdb-article.mobile-style-inverse #rdb-article-meta{color:#a6b5c2}#rdb-article.mobile-style-inverse a{color:#2fc2ef;-webkit-tap-highlight-color:#2fc2ef}body[data-online=false] #rdb-article.mobile-style-inverse a{color:#83cfe7;-webkit-tap-highlight-color:#83cfe7}#rdb-article.mobile-style-inverse hr{border-color:#fff}#rdb-article.mobile-style-athelas{background:#f7f7f7;color:#2b373d;font-family:'Palatino',Georgia,'Times New Roman',serif}#rdb-article.mobile-style-athelas h1{border-color:#cdcdcc}#rdb-article.mobile-style-athelas #rdb-article-meta{color:#707065}#rdb-article.mobile-style-athelas a{color:#1e83cb;-webkit-tap-highlight-color:#1e83cb}body[data-online=false] #rdb-article.mobile-style-athelas a{color:#255d84;-webkit-tap-highlight-color:#255d84}@media only screen and (orientation:landscape){#application[data-current-view=article] #rdb-actions #nav-home>a,#application[data-current-view=article] #rdb-actions #nav-home>a:active,#application[data-current-view=article] #rdb-actions #nav-home>a:focus{width:128px;background-position:16px 6px}}@media only screen and (min-device-width:768px){.tab-block{max-width:31.313em}.tab-block:not(#tab-block-signup) input:not([type=submit]){width:29.938em}.tab-block:not(#tab-block-signup) input[type=submit]{margin-right:auto;margin-left:auto;width:12em}#intro,#form-signup{display:inline;float:left;max-width:14.375em;padding-bottom:1em}#form-signup{float:right}#form-signup hr{display:none}#learn-more{clear:both}#rdb-actions #nav-home>a,#rdb-actions #nav-home>a:active,#rdb-actions #nav-home>a:focus{width:128px;background-position:16px 6px}#add-to-reading-list{width:35em}#rdb-articles-nav{padding:.625em;font-size:1.156em;letter-spacing:.035em}#rdb-articles-nav li{margin:0 .469em}#rdb-articles-list>li{font-size:1.156em}#rdb-articles-list .rdb-article-link{padding:1.25em 1.25em 1.5em}#rdb-article-marketing{max-width:31.313em}#rdb-article-marketing #marketing-devices{clear:left;float:left;margin:0 2.563em 1em 0}}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (-o-min-device-pixel-ratio:3/2),only screen and (min-device-pixel-ratio:1.5){#logo-home a{-webkit-background-size:184px 33px;background-image:url('/media/images/mobile/readability-logo@2x.png')}hr{-webkit-background-size:980px 12px;background-image:url('/media/images/mobile/flourishes@2x.png')}.download-itunes{-webkit-background-size:160px 56px;background-image:url('/media/images/mobile/appstore-soon@2x.png')}#rdb-logo,#rdb-actions>li>a{-webkit-background-size:96px 352px;background-image:url('/media/images/mobile/sprite-rdb-actions@2x.png')}.loading{-webkit-background-size:16px 16px;background-image:url('/media/images/mobile/loading@2x.gif')}#marketing-devices{-webkit-background-size:230px 197px;background-image:url('/media/images/mobile/marketing-bigscreen@2x.png')}body.ios #marketing-devices{-webkit-background-size:230px 197px;background-image:url('/media/images/mobile/marketing-bigscreen-ios@2x.png')}#rdb-article-marketing #marketing-devices{-webkit-background-size:80px 112px;background-image:url('/media/images/mobile/marketing-smallscreen@2x.png')}body.ios #rdb-article-marketing #marketing-devices{-webkit-background-size:80px 112px;background-image:url('/media/images/mobile/marketing-smallscreen-ios@2x.png')}#theme-next,#settings-margin span,#nav-share-menu span{-webkit-background-size:40px 200px;background-image:url('/media/images/mobile/sprite-rdb-submenus@2x.png')}}
View
6 gen/com/fahimk/readabilityclient/R.java
@@ -77,8 +77,9 @@
public static final int listitem_title=0x7f080004;
public static final int mainFrame=0x7f080019;
public static final int menu_archive=0x7f080027;
+ public static final int menu_delete=0x7f08002a;
public static final int menu_favorite=0x7f080026;
- public static final int menu_readlater=0x7f08002a;
+ public static final int menu_readlater=0x7f08002b;
public static final int menu_share=0x7f080029;
public static final int menu_styles=0x7f080028;
public static final int popup_window=0x7f08001b;
@@ -101,7 +102,8 @@
}
public static final class menu {
public static final int menu_authorized=0x7f070000;
- public static final int menu_guest=0x7f070001;
+ public static final int menu_clear=0x7f070001;
+ public static final int menu_guest=0x7f070002;
}
public static final class string {
public static final int app_name=0x7f050000;
View
2 default.properties → project.properties
@@ -4,7 +4,7 @@
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
# project structure.
# Project target.
View
9 src/com/fahimk/jsonobjects/RDD.java
@@ -0,0 +1,9 @@
+package com.fahimk.jsonobjects;
+
+import java.util.List;
+
+public class RDD {
+ public RDDMeta meta;
+ public List<String> messages;
+ public String success;
+}
View
7 src/com/fahimk/jsonobjects/RDDMeta.java
@@ -0,0 +1,7 @@
+package com.fahimk.jsonobjects;
+
+public class RDDMeta {
+ public String url;
+ public String rdd_url;
+ public String id;
+}
View
47 src/com/fahimk/readabilityclient/HelperMethods.java
@@ -6,6 +6,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
import java.util.Calendar;
import java.util.List;
import java.util.Random;
@@ -116,6 +117,36 @@ else if (m.getAction() == MotionEvent.ACTION_UP){
}
});
}
+
+ public static InputStream postStream(String url, List<NameValuePair> nvps) {
+ DefaultHttpClient client = new DefaultHttpClient();
+ Log.e("visiting: ", url);
+ HttpPost getRequest = new HttpPost(url);
+ try {
+ getRequest.setEntity(new UrlEncodedFormEntity(nvps));
+ } catch (UnsupportedEncodingException e1) {
+ e1.printStackTrace();
+ }
+ Log.e("heres what i got", "hello");
+ try {
+ HttpResponse getResponse = client.execute(getRequest);
+ final int statusCode = getResponse.getStatusLine().getStatusCode();
+ if (statusCode != HttpStatus.SC_OK) {
+ Log.w("HelperMethods.retrieveStream",
+ "Error " + statusCode + " for URL " + url);
+ return null;
+ }
+
+ return getResponse.getEntity().getContent();
+
+ }
+ catch (IOException e) {
+ getRequest.abort();
+ Log.w("HelperMethods.retrieveStream", "Error for URL " + url, e);
+ }
+
+ return null;
+ }
public static InputStream getStream(String url) {
DefaultHttpClient client = new DefaultHttpClient();
@@ -139,7 +170,6 @@ public static InputStream getStream(String url) {
}
return null;
-
}
public static String postData(String url, List<NameValuePair> nameValuePairs) throws Exception {
@@ -178,20 +208,11 @@ public static String parseHTML(String Url) throws Exception {
}
in.close();
html = str.toString();
- String s = "!-- Content --";
- String s2 = "!-- Scripts --";
- String s3 = "!-- Footer and Content Info --";
- String s4 = "!-- End #rdb-footer --";
- html = html.substring(html.indexOf(s) + s.length() + 1);
- html = html.substring(0, html.indexOf(s2) - s2.length() - 1);
- String topPart = html.substring(0, html.indexOf(s3) - s3.length() - 1);
- String bottomPart = html.substring(html.indexOf(s4) + s4.length() + 1);
- String fullHtml = topPart + bottomPart;
+ String fullHtml = html;
- fullHtml = fullHtml.replace("/learn-more", "http://www.readability.com/learn-more");
- fullHtml = "<head><link rel=\"stylesheet\" href=\"file:///android_asset/mobile2.css\" type=\"text/css\" media=\"all\" charset=\"utf-8\"" + fullHtml;
+ //fullHtml = "<head><link rel=\"stylesheet\" href=\"file:///android_asset/mobile2.css\" type=\"text/css\" media=\"all\" charset=\"utf-8\"" + fullHtml;
fullHtml = fullHtml + "<script type=\"text/javascript\" src=\"file:///android_asset/jquery.min.js\"></script>";
- html = html.replaceAll("/media/css/mobile2.css", "file:///android_asset/mobile2.css");
+ fullHtml = fullHtml.replaceAll("/media/css/mobile.min.css", "file:///android_asset/mobile.css");
//html = html.replaceAll("//ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js", "file:///android_asset/jquery.min.js");
html = html.replace("</script>", "</script>\n <script type=\"text/javascript\" src=\"file:///android_asset/jquery.min.js\"></script>\n");
//c = c.replaceAll("<a href=\"#\" class=\"article-back-link\">", "<a href=\"##\" class=\"article-back-link\">");
View
51 src/com/fahimk/readabilityclient/MainMenu.java
@@ -93,6 +93,7 @@
import android.widget.TextView.OnEditorActionListener;
import com.fahimk.jsonobjects.Bookmark;
+import com.fahimk.jsonobjects.RDD;
import com.fahimk.jsonobjects.SearchBookmarks;
import com.google.gson.Gson;
@@ -528,6 +529,7 @@ public void handleMessage(Message msg) {
String fullUrl = "";
@Override
protected void onPostExecute(String url) {
+ Log.e("line", url);
if(progress.isShowing()) {
progress.dismiss();
}
@@ -554,49 +556,17 @@ protected String doInBackground(String... urls) {
String url = urls[0];
fullUrl = url;
try {
- DefaultHttpClient mHttpClient = new DefaultHttpClient();
- BasicHttpContext mHttpContext = new BasicHttpContext();
- CookieStore mCookieStore = new BasicCookieStore();
- mHttpContext.setAttribute(ClientContext.COOKIE_STORE, mCookieStore);
-
- HttpGet httpget = new HttpGet("http://www.readability.com/shorten");
-
- HttpResponse response;
- response = mHttpClient.execute(httpget, mHttpContext);
-
- HttpPost httpost = new HttpPost("http://www.readability.com/~/");
List <NameValuePair> nvps = new ArrayList <NameValuePair>();
nvps.add(new BasicNameValuePair("url", url));
-
- httpost.setEntity(new UrlEncodedFormEntity(nvps, HTTP.UTF_8));
- httpost.setHeader("Keep-Alive", "115");
- httpost.setHeader("Connection", "keep-alive");
- httpost.setHeader("Referer", "http://www.readability.com/shorten");
- httpost.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1");
- httpost.setHeader("X-Requested-With", "XMLHttpRequest");
- List<Cookie> cl = mCookieStore.getCookies();
- StringBuffer com = new StringBuffer();
- for(Cookie c: cl) {
- com.append(c.getName());
- com.append("=");
- com.append(c.getValue());
- com.append(";");
- }
- httpost.setHeader("Cookie", com.toString());
- response = mHttpClient.execute(httpost, mHttpContext);
-
- InputStream i = response.getEntity().getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(i));
- String line = reader.readLine();
- String articlesObject = "/articles/";
- int begin = line.indexOf("/articles/");
- int end = line.indexOf("\"", begin);
- return line.substring(begin+articlesObject.length(), end);
- }
- catch (IOException e) {
- e.printStackTrace();
- return connectionError;
+
+ InputStream bookmarksSource = HelperMethods.postStream("https://readability.com/api/shortener/v1/urls", nvps);
+
+ //Log.e("bookmarksSource", bookmarksSource.toString() + "abc");
+ Gson bookmarkGson = new Gson();
+ Reader bookmarkReader = new InputStreamReader(bookmarksSource);
+ RDD rdd = bookmarkGson.fromJson(bookmarkReader, RDD.class);
+ return rdd.meta.rdd_url;
}
catch (Exception e) {
e.printStackTrace();
@@ -693,6 +663,7 @@ protected Boolean doInBackground(Boolean... params) {
else if(!bm.archive) {
try {
String html = parseHTML("http://readability.com/mobile/articles/"+bm.article.id);
+ Log.e("url: ", "http://readability.com/mobile/articles/"+bm.article.id);
values.put(ARTICLE_CONTENT, html);
database.insert(ARTICLE_TABLE, null, values);
Log.e("inserted", bm.article.title );
View
14 src/com/fahimk/readabilityclient/WebActivity.java
@@ -373,7 +373,7 @@ public void run() {
}.start();
}
-
+
private void toggleFavorite() {
favorite = (favorite.equals("0")) ? "1" : "0";
WebSyncArticles task = new WebSyncArticles();
@@ -549,7 +549,7 @@ public void onPageFinished(WebView view, String url){
"var readBar = document.getElementById('read-bar'); readBar.parentNode.removeChild(readBar);"+
"var footNote = document.getElementById('article-marketing'); footNote.parentNode.removeChild(footNote);"+
"var bottom = document.getElementById('article-nav'); bottom.parentNode.removeChild(bottom);" +
- "})()");
+ "})()");
view.loadUrl("javascript:(function() {" +
"$(document).ready(function() {" +
"$('body').scrollTop($('body').outerHeight() * " + read_percent + " )" +
@@ -603,11 +603,11 @@ public void handleMessage(Message msg) {
bookmarkCancelMessage.show();
break;
}
- case MSG_WV_READ_PERCENT:
- new WebSyncArticles().execute();
- Toast message4 = Toast.makeText(WebActivity.this, "Read position saved", Toast.LENGTH_LONG);
- message4.show();
- break;
+ case MSG_WV_READ_PERCENT:
+ new WebSyncArticles().execute();
+ Toast message4 = Toast.makeText(WebActivity.this, "Read position saved", Toast.LENGTH_LONG);
+ message4.show();
+ break;
case MSG_FAIL:
if(pDialog.isShowing())
pDialog.dismiss();

0 comments on commit 1c9d250

Please sign in to comment.
Something went wrong with that request. Please try again.