wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to 0.5.8 - fix unwanted tap on links

Browse source
This commit is contained in:
David Development 2014-04-17 20:46:55 +02:00
parent 6ae734b9a1
commit b756f56d5f
8 changed files with 136 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
News-Android-App.apk
View file

Binary file not shown.

2
News-Android-App/News-Android-App-News-Android-App.iml
View file

@ -73,8 +73,8 @@
<orderEntry type="library" exported="" name="library-0.2.0" level="project" />
<orderEntry type="library" exported="" name="library-0.9.3" level="project" />
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.7.2" level="project" />
<orderEntry type="library" exported="" name="support-v4-19.0.1" level="project" />
<orderEntry type="library" exported="" name="actionbarsherlock-4.4.0" level="project" />
<orderEntry type="module" module-name="MessageBar" exported="" />
<orderEntry type="module" module-name="ChangeLogLibrary" exported="" />

4
News-Android-App/src/main/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.luhmer.owncloudnewsreader"
android:versionCode="42"
android:versionName="0.5.7" >
android:versionCode="43"
android:versionName="0.5.8" >
<uses-sdk
android:minSdkVersion="7"

46
News-Android-App/src/main/assets/LinkLongClick.js
View file

@ -4,28 +4,38 @@ for (var i = 0; i < links.length; i++) {
(function (link) {
var timer;
link.addEventListener('mouseup', function() {
clearTimeout(timer);
});
link.addEventListener('mousedown', function (e) {
timer = window.setTimeout(function() {
e.preventDefault();
Android.openLinkInBrowser(link.getAttribute('href'));
}, 1000);
});
if(link.children.length > 0 && link.children[0].nodeName != "IMG ") {
//Do nothing
} else {
link.addEventListener('mouseup', function() {
clearTimeout(timer);
});
link.addEventListener("touchstart", function(e){
timer = window.setTimeout(function() {
e.preventDefault();
Android.openLinkInBrowser(link.getAttribute('href'));
}, 1000);
});
link.addEventListener('mousedown', function (e) {
timer = window.setTimeout(function() {
e.preventDefault();
//alert(link.children[0].nodeName);
Android.openLinkInBrowser(link.getAttribute('href'));
}, 1000);
});
link.addEventListener('touchend', function() {
clearTimeout(timer);
});
link.addEventListener("touchstart", function(e){
timer = window.setTimeout(function() {
e.preventDefault();
Android.openLinkInBrowser(link.getAttribute('href'));
}, 1000);
});
link.addEventListener("touchmove", function(e){
clearTimeout(timer);
});
link.addEventListener('touchend', function() {
clearTimeout(timer);
});
}
})(links[i]);
}

78
News-Android-App/src/main/assets/web_template.html
View file

@ -1,12 +1,12 @@
<html>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<script type="text/javascript">
window.onload = function ()
{
var images = document.getElementsByTagName('img');
for (var i = 1; i < images.length; i++) {// i = 1 because of the feed image which has no caption
if(images[i].getAttribute('title') != "" &&
images[i].getAttribute('title') != null &&
@ -34,6 +34,10 @@
}, 1000);
});
image.addEventListener("touchmove", function(e){
clearTimeout(timer);
});
image.addEventListener('touchend', function() {
clearTimeout(timer);
});
@ -41,7 +45,7 @@
}
}
}
</script>
@ -51,27 +55,27 @@
font-family: "ROBOTO_BLACK";
src: url('file:///android_asset/fonts/Roboto-Black.ttf');
}
@font-face {
font-family: "ROBOTO_BOLD";
src: url('file:///android_asset/fonts/Roboto-Bold.ttf');
}
@font-face {
font-family: "ROBOTO_CONDENSED_BOLD";
src: url('file:///android_asset/fonts/Roboto-BoldCondensed.ttf');
}
@font-face {
font-family: "ROBOTO_CONDENSED";
src: url('file:///android_asset/fonts/Roboto-Condensed.ttf');
}
@font-face {
font-family: "ROBOTO_LIGHT";
src: url('file:///android_asset/fonts/Roboto-Light.ttf');
}
@font-face {
font-family: "ROBOTO_MEDIUM";
src: url('file:///android_asset/fonts/Roboto-Medium.ttf');
@ -106,35 +110,35 @@
font-family: "ROBOTOSLAB_THIN";
src: url('file:///android_asset/fonts/RobotoSlab-Thin.ttf');
}
body#darkTheme {
/* font-family: 'Segoe UI', 'Segoe UI Light', 'Droid Sans', sans-serif ; */
font-family: 'ROBOTO_FONT_STYLE', 'Segoe UI', 'Segoe UI Light';
font-family: 'ROBOTO_FONT_STYLE', 'Segoe UI', 'Segoe UI Light';
font-size: 18px;
font-weight: normal;
background-color: #222;
color: #EEE;
/* color: #2C2E2F;*/
}
body#lightTheme {
font-family: 'ROBOTO_FONT_STYLE', 'Segoe UI', 'Segoe UI Light';
font-family: 'ROBOTO_FONT_STYLE', 'Segoe UI', 'Segoe UI Light';
font-size: 18px;
font-weight: normal;
background-color: #E1E1E1;
color: #333;
}
body, blockquote, img, iframe, video, div, table, tbody, tr, td, pre, code, blockquote, p, em, b {
width: auto !important;
height: auto !important;
max-width: 100% !important;
margin-left: 4px;
margin-right: 4px;
}
pre, code, blockquote, p, em, b {
white-space: -moz-pre-wrap !important;
white-space: -pre-wrap !important;
@ -147,57 +151,57 @@
margin-left: auto !important;
margin-right: auto !important;
}
body {
word-wrap: break-word !important;
}
#content table {
width:100% !important;
table-layout:fixed;
table-layout:fixed;
}
#header {
font-size: 21px;
margin-bottom: 5px;
font-weight: bold;
}
#header a:link, a:active, a:hover, a:visited {
color: #DADADA !important;
text-decoration: none !important;
}
#subscription, #datetime {
margin-bottom:3px;
font-size:12px;
}
#subscription {
float:left;
}
#datetime {
float:right;
}
#header_small_text {
overflow: auto;
}
#zierleiste {
margin-top: 2px !important;
height: 1px !important;
background-color: #B3B3B3;
}
#content {
margin-top:10px;
font-weight:500;
line-height: 1.5em !important;
}
#imgFavicon {
margin-left:-3px;
vertical-align:middle;
@ -205,14 +209,14 @@
width:16px !important;
height:16px !important;
}
body#lightTheme a:link, a:active, a:hover {
color: #555 !important;
}
body#lightTheme a:visited {
color: #000 !important;
}
body#darkTheme a:link, a:active, a:hover {
color: #DADADA !important;
}
@ -225,19 +229,19 @@
<body id="lightTheme">
<div id="header">
</div>
<div id="header_small_text">
<div id="subscription">
<div id="header_small_text">
<div id="subscription">
<img id="imgFavicon" src="" />
</div>
<div id="datetime">
</div>
</div>
<div id="zierleiste">
</div>
<div id="content">
</div>
</body>

96
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsActivity.java
View file

@ -78,7 +78,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
public static final String EDT_PASSWORD_STRING = "edt_password";
public static final String EDT_OWNCLOUDROOTPATH_STRING = "edt_owncloudRootPath";
public static final String EDT_CLEAR_CACHE = "edt_clearCache";
//public static final String CB_ALLOWALLSSLCERTIFICATES_STRING = "cb_AllowAllSSLCertificates";
public static final String CB_SYNCONSTARTUP_STRING = "cb_AutoSyncOnStart";
public static final String CB_SHOWONLYUNREAD_STRING = "cb_ShowOnlyUnread";
@ -88,42 +88,42 @@ public class SettingsActivity extends SherlockPreferenceActivity {
public static final String CB_DISABLE_HOSTNAME_VERIFICATION_STRING = "cb_DisableHostnameVerification";
public static final String CB_SKIP_DETAILVIEW_AND_OPEN_BROWSER_DIRECTLY_STRING = "cb_openInBrowserDirectly";
public static final String CB_SHOW_NOTIFICATION_NEW_ARTICLES_STRING = "cb_showNotificationNewArticles";
public static final String SP_APP_THEME = "sp_app_theme";
public static final String SP_FEED_LIST_LAYOUT = "sp_feed_list_layout";
public static final String SP_MAX_CACHE_SIZE = "sp_max_cache_size";
public static final String SP_FONT = "sp_font";
public static final String SP_FONT = "sp_font";
public static final String SP_SORT_ORDER = "sp_sort_order";
static //public static final String PREF_SIGN_IN_DIALOG = "sPref_signInDialog";
//public static final String SP_MAX_ITEMS_SYNC = "sync_max_items";
EditTextPreference clearCachePref;
static Activity _mActivity;
@Override
protected void onCreate(Bundle savedInstanceState) {
protected void onCreate(Bundle savedInstanceState) {
ThemeChooser.chooseTheme(this);
super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
_mActivity = this;
setupSimplePreferencesScreen();
}
/**
* Shows the simplified settings UI if the device configuration if the
* device configuration dictates that a simplified, single-pane UI should be
@ -133,8 +133,8 @@ public class SettingsActivity extends SherlockPreferenceActivity {
private void setupSimplePreferencesScreen() {
if (!isSimplePreferences(this)) {
return;
}
}
// In the simplified UI, fragments are not used at all and we instead
// use the older PreferenceActivity APIs.
@ -145,8 +145,8 @@ public class SettingsActivity extends SherlockPreferenceActivity {
header.setTitle(R.string.pref_header_display);
getPreferenceScreen().addPreference(header);
addPreferencesFromResource(R.xml.pref_display);
header = new PreferenceCategory(this);
header.setTitle(R.string.pref_header_data_sync);
getPreferenceScreen().addPreference(header);
@ -162,7 +162,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
bindDataSyncPreferences(null, this);
bindNotificationPreferences(null, this);
}
/* (non-Javadoc)
* @see com.actionbarsherlock.app.SherlockPreferenceActivity#onOptionsItemSelected(com.actionbarsherlock.view.MenuItem)
*/
@ -215,6 +215,12 @@ public class SettingsActivity extends SherlockPreferenceActivity {
}
}
@TargetApi(Build.VERSION_CODES.KITKAT)
@Override
protected boolean isValidFragment(String fragmentName) {
return true;
}
/**
* A preference value change listener that updates the preference's summary
* to reflect its new value.
@ -262,7 +268,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
* preference title) is updated to reflect the value. The summary is also
* immediately updated upon calling this method. The exact display format is
* dependent on the type of preference.
*
*
* @see #sBindPreferenceSummaryToValueListener
*/
private static void bindPreferenceSummaryToValue(Preference preference) {
@ -290,7 +296,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
preference.getContext()).getBoolean(preference.getKey(), false));
}
/**
/**
* This fragment shows general preferences only. It is used when the
* activity is showing a two-pane settings UI.
*/
@ -304,7 +310,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
bindGeneralPreferences(this, null);
}
}
/**
* This fragment shows notification preferences only. It is used when the
@ -336,8 +342,8 @@ public class SettingsActivity extends SherlockPreferenceActivity {
bindDataSyncPreferences(this, null);
}
}
/**
* This fragment shows data and sync preferences only. It is used when the
* activity is showing a two-pane settings UI.
@ -352,9 +358,9 @@ public class SettingsActivity extends SherlockPreferenceActivity {
bindDisplayPreferences(this, null);
}
}
@SuppressWarnings("deprecation")
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
private static void bindDisplayPreferences(PreferenceFragment prefFrag, PreferenceActivity prefAct)
@ -372,7 +378,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
bindPreferenceSummaryToValue(prefAct.findPreference(SP_FONT));
}
}
@SuppressWarnings("deprecation")
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
private static void bindGeneralPreferences(PreferenceFragment prefFrag, final PreferenceActivity prefAct)
@ -408,13 +414,13 @@ public class SettingsActivity extends SherlockPreferenceActivity {
bindPreferenceSummaryToValue(prefAct.findPreference(SP_SORT_ORDER));
}
}
@SuppressWarnings("deprecation")
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
private static void bindDataSyncPreferences(PreferenceFragment prefFrag, PreferenceActivity prefAct)
{
if(prefFrag != null)
{
{
//bindPreferenceSummaryToValue(prefFrag.findPreference(SP_MAX_ITEMS_SYNC));
clearCachePref = (EditTextPreference) prefFrag.findPreference(EDT_CLEAR_CACHE);
bindPreferenceBooleanToValue(prefFrag.findPreference(CB_CACHE_IMAGES_OFFLINE_STRING));
@ -426,18 +432,18 @@ public class SettingsActivity extends SherlockPreferenceActivity {
clearCachePref = (EditTextPreference) prefAct.findPreference(EDT_CLEAR_CACHE);
bindPreferenceBooleanToValue(prefAct.findPreference(CB_CACHE_IMAGES_OFFLINE_STRING));
bindPreferenceSummaryToValue(prefAct.findPreference(SP_MAX_CACHE_SIZE));
}
//clearCache.setText("")
clearCachePref.setSummary(_mActivity.getString(R.string.calculating_cache_size));
new GetCacheSizeAsync().execute((Void)null);
clearCachePref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
((EditTextPreference) preference).getDialog().dismiss();
CheckForUnsycedChangesInDatabaseAndResetDatabase(_mActivity);
@ -460,7 +466,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
}
}
public static void CheckForUnsycedChangesInDatabaseAndResetDatabase(final Context context) {
DatabaseConnection dbConn = new DatabaseConnection(context);
boolean resetDatabase = true;
@ -472,7 +478,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
resetDatabase = false;
else if(dbConn.getAllNewUnstarredItems().size() > 0)
resetDatabase = false;
if(resetDatabase) {
new ResetDatabaseAsyncTask(context).execute();
} else {
@ -480,12 +486,12 @@ public class SettingsActivity extends SherlockPreferenceActivity {
.setTitle(context.getString(R.string.warning))
.setMessage(context.getString(R.string.reset_cache_unsaved_changes))
.setPositiveButton(context.getString(android.R.string.ok), new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
PostDelayHandler pDelayHandler = new PostDelayHandler(context);
pDelayHandler.stopRunningPostDelayHandler();
new ResetDatabaseAsyncTask(context).execute();
}
})
@ -493,7 +499,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
.create()
.show();
}
dbConn.closeDatabase();
}
@ -549,7 +555,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
int count = 0;
long size = 0;
DecimalFormat dcmFormat = new DecimalFormat("#.##");
@Override
protected Void doInBackground(Void... params) {
try
@ -571,7 +577,7 @@ public class SettingsActivity extends SherlockPreferenceActivity {
clearCachePref.setSummary(mCount + " - " + mSize);
super.onPostExecute(result);
};
public long getFolderSize(File dir) {
if(dir.isDirectory())
{

12
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeChooser.java
View file

@ -32,7 +32,7 @@ import de.luhmer.owncloudnewsreader.R;
import de.luhmer.owncloudnewsreader.SettingsActivity;
public class ThemeChooser {
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public static void chooseTheme(Activity act)
{
@ -42,7 +42,7 @@ public class ThemeChooser {
// act.setTheme(android.R.style.Theme_Holo);
//else
//act.setTheme(R.style.Sherlock___Theme);
act.setTheme(R.style.Theme_Sherlock);
act.setTheme(R.style.Theme_Sherlock);
} else {
//if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
// act.setTheme(android.R.style.Theme_Holo_Light_DarkActionBar);
@ -51,7 +51,7 @@ public class ThemeChooser {
act.setTheme(R.style.Theme_Sherlock_Light_DarkActionBar);
}
}
/*
public static void ChangeBackgroundOfSlider(Activity activity) {
View navigation_drawer = activity.getWindow().getDecorView().findViewById(R.id.left_drawer);
@ -61,15 +61,15 @@ public class ThemeChooser {
navigation_drawer.setBackgroundColor(color.abs__background_holo_light);
}
*/
public static boolean isDarkTheme(Context context)
{
SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
String value = mPrefs.getString(SettingsActivity.SP_APP_THEME, "0");
if(value.equals("0"))
return true;
return false;
}
}

9
README.md
View file

@ -64,10 +64,15 @@ git clone --recursive https://github.com/owncloud/News-Android-App.git -b dev
Updates
==================================
0.5.8 (in development)
0.5.9 (in development)
---------------------
0.5.8 (Google Play)
---------------------
- Bug fix - <a href="https://github.com/owncloud/News-Android-App/issues/214">#214 Scrolling within article causes unwanted tap on links</a>
0.5.7 (Google Play - Beta)
---------------------
- Bug fix - <a href="https://github.com/owncloud/News-Android-App/issues/213">#213 When using the dark theme websites with no background color are unreadable</a>
@ -75,7 +80,7 @@ Updates
- Improvement - <a href="https://github.com/owncloud/News-Android-App/issues/198">#198 enable auto sync configuration</a>
0.5.6 (Google Play)
0.5.6
---------------------
- Fixed flickering of the screen when changing Feeds (in dark Theme)
- New Pull-To-Refresh Style