diff options
Diffstat (limited to 'News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper')
8 files changed, 525 insertions, 262 deletions
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/AlphaAnimator.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/AlphaAnimator.java new file mode 100644 index 00000000..319fa564 --- /dev/null +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/AlphaAnimator.java @@ -0,0 +1,53 @@ +package de.luhmer.owncloudnewsreader.helper; + +import android.view.View; +import android.view.animation.AlphaAnimation; +import android.view.animation.Animation; + +/** + * Created by David on 02.07.2014. + */ +public class AlphaAnimator { + + public static void AnimateVisibilityChange(final View view, final int visibilityTo) { + + + Animation animation; + if(visibilityTo == View.GONE) { + animation = new AlphaAnimation(1f, 0f); + } else { + view.setAlpha(0.1f); + view.setVisibility(View.VISIBLE); + animation = new AlphaAnimation(0f, 1f); + } + + + animation.setFillAfter(true); + animation.setDuration(1000); + animation.setStartOffset(1000); + //animation.setStartOffset(5000); + + /* + animation.setAnimationListener(new Animation.AnimationListener() { + @Override + public void onAnimationStart(Animation animation) { + + } + + @Override + public void onAnimationEnd(Animation animation) { + view.setVisibility(visibilityTo); + } + + @Override + public void onAnimationRepeat(Animation animation) { + + } + }); + */ + + animation.start(); + + + } +} diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/DatabaseUtils.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/DatabaseUtils.java index 51370fc5..8ef35a43 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/DatabaseUtils.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/DatabaseUtils.java @@ -55,6 +55,6 @@ public class DatabaseUtils { } public static File GetPath(Context context) { - return new File(ImageHandler.getPath(context) + "/dbBackup/" + DatabaseHelper.DATABASE_NAME); + return new File(FileUtils.getPath(context) + "/dbBackup/" + DatabaseHelper.DATABASE_NAME); } } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/FavIconHandler.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/FavIconHandler.java index 9f2ac621..0dbadfba 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/FavIconHandler.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/FavIconHandler.java @@ -46,7 +46,7 @@ public class FavIconHandler { { try { - File favIconFile = ImageHandler.getFullPathOfCacheFile(URL_TO_PAGE, ImageHandler.getPathFavIcons(context)); + File favIconFile = ImageHandler.getFullPathOfCacheFile(URL_TO_PAGE, FileUtils.getPathFavIcons(context)); if(favIconFile.isFile() && favIconFile.length() > 0) { if(feedID != null) { @@ -94,7 +94,7 @@ public class FavIconHandler { int key = Integer.parseInt(feedID); favIconToFeedId.put(key, favIconCache); - GetImageAsyncTask giAsync = new GetImageAsyncTask(WEB_URL_TO_FILE, favIconDownloadFinished, key, ImageHandler.getPathFavIcons(context), context, null); + GetImageAsyncTask giAsync = new GetImageAsyncTask(WEB_URL_TO_FILE, favIconDownloadFinished, key, FileUtils.getPathFavIcons(context), context, null); giAsync.scaleImage = true; giAsync.dstHeight = 2*32; giAsync.dstWidth = 2*32; @@ -146,7 +146,7 @@ public class FavIconHandler { imageView.setImageDrawable(null); - GetImageAsyncTask giAsync = new GetImageAsyncTask(WEB_URL_TO_FILE, imgDownloadFinished, key, ImageHandler.getPathFavIcons(context), context/*, imageView*/, lruCache); + GetImageAsyncTask giAsync = new GetImageAsyncTask(WEB_URL_TO_FILE, imgDownloadFinished, key, FileUtils.getPathFavIcons(context), context/*, imageView*/, lruCache); giAsync.scaleImage = true; giAsync.dstHeight = 2*32; giAsync.dstWidth = 2*32; diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/FileUtils.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/FileUtils.java index d329987c..cb230b35 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/FileUtils.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/FileUtils.java @@ -21,6 +21,9 @@ package de.luhmer.owncloudnewsreader.helper; +import android.content.Context; +import android.os.Environment; + import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; @@ -35,7 +38,7 @@ public class FileUtils { * <br/> * <i> Note: <code>fromFile</code> and <code>toFile</code> will be closed by * this function.</i> - * + * * @param fromFile * - FileInputStream for the file to copy from. * @param toFile @@ -60,4 +63,45 @@ public class FileUtils { } } } + + + + + + public static String getPath(Context context) { + String url; + Boolean isSDPresent = android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED); + if(isSDPresent) + { + url = Environment.getExternalStorageDirectory().getAbsolutePath(); + if (android.os.Build.DEVICE.contains("Samsung") || android.os.Build.MANUFACTURER.contains("Samsung")) { + url = url + "/external_sd"; + } + //url = url + "/" + context.getString(R.string.app_name); + url = url + "/ownCloud News Reader"; + } + else + url = context.getCacheDir().getAbsolutePath(); + + return url; + } + + + + + public static String getPathPodcasts(Context context) + { + return getPath(context) + "/podcasts"; + } + + public static String getPathFavIcons(Context context) + { + return getPath(context) + "/favIcons"; + } + + public static String getPathImageCache(Context context) + { + return getPath(context) + "/imgCache"; + } + } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ImageHandler.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ImageHandler.java index 87a36ac8..90c2029f 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ImageHandler.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ImageHandler.java @@ -23,7 +23,6 @@ package de.luhmer.owncloudnewsreader.helper; import android.content.Context; import android.graphics.drawable.Drawable; -import android.os.Environment; import java.io.File; import java.io.FileOutputStream; @@ -116,34 +115,6 @@ public class ImageHandler { - public static String getPathFavIcons(Context context) - { - return getPath(context) + "/favIcons"; - } - - public static String getPathImageCache(Context context) - { - return getPath(context) + "/imgCache"; - } - - public static String getPath(Context context) { - String url; - Boolean isSDPresent = android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED); - if(isSDPresent) - { - url = Environment.getExternalStorageDirectory().getAbsolutePath(); - if (android.os.Build.DEVICE.contains("Samsung") || android.os.Build.MANUFACTURER.contains("Samsung")) { - url = url + "/external_sd"; - } - //url = url + "/" + context.getString(R.string.app_name); - url = url + "/ownCloud News Reader"; - } - else - url = context.getCacheDir().getAbsolutePath(); - - return url; - } - public static List<String> getImageLinksFromText(String text) { @@ -168,14 +139,14 @@ public class ImageHandler { public static boolean clearCache(Context context) { - String path = getPath(context); + String path = FileUtils.getPath(context); boolean result = deleteDir(new File(path)); createNoMediaFile(context); return result; } public static void createNoMediaFile(Context context) { - String path = getPath(context); + String path = FileUtils.getPath(context); createEmptyFile(path + "/.nomedia"); } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/JavaYoutubeDownloader.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/JavaYoutubeDownloader.java new file mode 100644 index 00000000..260fabe7 --- /dev/null +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/JavaYoutubeDownloader.java @@ -0,0 +1,381 @@ +package de.luhmer.owncloudnewsreader.helper; + +import android.content.Context; + +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.CookieStore; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.protocol.ClientContext; +import org.apache.http.client.utils.URIUtils; +import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.HttpContext; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.io.Writer; +import java.math.BigInteger; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.security.MessageDigest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Scanner; +import java.util.regex.Pattern; + +import de.luhmer.owncloudnewsreader.collections.IKeyValuePair; +import de.luhmer.owncloudnewsreader.collections.KeyValuePair; +import de.luhmer.owncloudnewsreader.collections.MapUtils; +import de.luhmer.owncloudnewsreader.collections.URLParams; + +public class JavaYoutubeDownloader { + + public static String newline = System.getProperty("line.separator"); + public static final String scheme = "http"; + public static final String host = "www.youtube.com"; + public static final Pattern commaPattern = Pattern.compile(","); + public static final char[] ILLEGAL_FILENAME_CHARACTERS = { '/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':' }; + + + + + + + public String getVideoID( String urlString ){ + int start = urlString.indexOf("?v=") + 3; + int end = urlString.indexOf("&", start); + if ( end == -1 ){ + end = urlString.length(); + } + + if(start == 2) { //Doesn't work + start = urlString.indexOf("/v/") + 3; + end = urlString.indexOf("?", start); + if (end == -1){ + end = urlString.length(); + } + } + + return urlString.substring(start, end); + } + + public String getExtension(int format) { + return "mp4"; + } + + + public String getDownloadUrl(String url, Context context) throws Throwable { + + //Map<String, String> videoInfo = getVideoInfo(getVideoID(url));// Html.fromHtml(getStringFromWebsite("http://youtube.com/get_video_info?video_id=" + getVideoID(url))).toString(); + /* + + byte[] b = videoInfo.getBytes(); + String videoInfoAscii = new String(b, "ASCII"); + */ + + //getFullPathOfPodcastYoutubeFile(url, context), ".mp4" + + //String urlTemp = videoInfo.get("sig"); + + return getDownloadUrl(getVideoID(url), "UTF-8", "ownCloud News Reader"); + } + + public static File getFullPathOfPodcastYoutubeFile(String WEB_URL_TO_FILE, Context context) throws Exception + { + String rootPath = FileUtils.getPathPodcasts(context); + URL url = new URL(WEB_URL_TO_FILE.trim()); + + MessageDigest m = MessageDigest.getInstance("MD5"); + m.reset(); + m.update(url.toString().getBytes()); + byte[] digest = m.digest(); + BigInteger bigInt = new BigInteger(1,digest); + String hashtext = bigInt.toString(16); + + return new File(rootPath + "/" + hashtext + ".mp4"); + } + + + public String getDownloadUrl(String videoId, String encoding, String userAgent) throws Throwable { + //Utils.log.fine("Retrieving " + videoId); + List<NameValuePair> qparams = new ArrayList<NameValuePair>(); + qparams.add(new BasicNameValuePair("video_id", videoId)); + URI uri = getUri("get_video_info", qparams); + + CookieStore cookieStore = new BasicCookieStore(); + HttpContext localContext = new BasicHttpContext(); + localContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore); + + HttpClient httpclient = new DefaultHttpClient(); + HttpGet httpget = new HttpGet(uri); + httpget.setHeader("User-Agent", userAgent); + + //Utils.log.finer("Executing " + uri); + HttpResponse response = httpclient.execute(httpget, localContext); + HttpEntity entity = response.getEntity(); + if (entity != null && response.getStatusLine().getStatusCode() == 200) { + InputStream instream = entity.getContent(); + String videoInfo = getStringFromInputStream(encoding, instream); + if (videoInfo != null && videoInfo.length() > 0) { + List<NameValuePair> infoMap = new ArrayList<NameValuePair>(); + URLEncodedUtils.parse(infoMap, new Scanner(videoInfo), encoding); + String downloadUrl = null; + String filename = videoId; + int bestQuality = -1; + for (NameValuePair pair : infoMap) { + String key = pair.getName(); + String val = pair.getValue(); + //Utils.log.finest(key + "=" + val); + if (key.equals("title")) { + filename = val; + } else if (key.equals("url_encoded_fmt_stream_map")) { + String[] formats = commaPattern.split(val); + + String fmtString = null; + //for (String fmt : formats) { + String fmt = formats[0]; { + int itagLocation = fmt.indexOf("itag="); + if ( itagLocation == -1 ) continue; + itagLocation += 5; + String subStr = null; + try { + subStr = fmt.substring(itagLocation, fmt.indexOf("&", itagLocation)); + } + catch( IndexOutOfBoundsException ex){ + return "Could not find the itag attribute to determine quality"; + } + int tempQuality = Integer.parseInt(fmt.substring(itagLocation, fmt.indexOf("&", itagLocation))); + if ( bestQuality < tempQuality ){ + bestQuality = tempQuality; + fmtString = fmt; + } + + } + //we are going to automatically download the best quality youtube + int begin = fmtString.indexOf("url="); + int sig = fmtString.indexOf("sig="); + if (begin != -1) { + int end = fmtString.indexOf("&", begin + 4); + int end2 = fmtString.indexOf("&", sig + 4); + if (end == -1) { + end = fmtString.length(); + } + if (end2 == -1 ){ + end2 = fmtString.length(); + } + String tempURL = fmtString.substring(begin+ 4, end ); + String signatureURL = URLEncoder.encode("&signature="+fmtString.substring(sig + 4, end2), "UTF-8"); + //downloadUrl = new String(URLCodec.decodeUrl((tempURL + signatureURL).getBytes())); + downloadUrl = URLDecoder.decode((tempURL + signatureURL), "UTF-8"); + + return downloadUrl; + //break; + } + } + } + + /* + if ( downloadUrl == null ){ + //Utils.log.fine("Content is protected"); + } + filename = cleanFilename(filename); + if (filename.length() == 0) { + filename = videoId; + } else { + filename += "_" + videoId; + } + filename += "." + extension; + File outputfile = new File(outputdir, filename); + if (downloadUrl != null) { + downloadWithHttpClient(userAgent, downloadUrl, outputfile); + } + */ + } + } + return "successful"; + } + + public void downloadWithHttpClient(String userAgent, String downloadUrl, File outputfile) throws Throwable { + + HttpGet httpget2 = new HttpGet(downloadUrl); + //Utils.log.finer("Executing " + httpget2.getURI()); + HttpClient httpclient2 = new DefaultHttpClient(); + + HttpResponse response2 = httpclient2.execute(httpget2); + HttpEntity entity2 = response2.getEntity(); + + if (entity2 != null && response2.getStatusLine().getStatusCode() == 200) { + long length = entity2.getContentLength(); + InputStream instream2 = entity2.getContent(); + //Utils.log.finer("Writing " + length + " bytes to " + outputfile); + if (outputfile.exists()) { + outputfile.delete(); + } + FileOutputStream outstream = new FileOutputStream(outputfile); + try { + byte[] buffer = new byte[2048]; + int count = -1; + while ((count = instream2.read(buffer)) != -1) { + outstream.write(buffer, 0, count); + } + outstream.flush(); + } finally { + outstream.close(); + } + } + } + + private String cleanFilename(String filename) { + for (char c : ILLEGAL_FILENAME_CHARACTERS) { + filename = filename.replace(c, '_'); + } + return filename; + } + + private static URI getUri(String path, List<NameValuePair> qparams) throws URISyntaxException { + URI uri = URIUtils.createURI(scheme, host, -1, "/" + path, URLEncodedUtils.format(qparams, "UTF-8"), null); + return uri; + } + + private String getStringFromInputStream(String encoding, InputStream instream) throws UnsupportedEncodingException, IOException { + Writer writer = new StringWriter(); + + char[] buffer = new char[1024]; + try { + Reader reader = new BufferedReader(new InputStreamReader(instream, encoding)); + int n; + while ((n = reader.read(buffer)) != -1) { + writer.write(buffer, 0, n); + } + } finally { + instream.close(); + } + String result = writer.toString(); + return result; + } + + + private String getStringFromWebsite(String url) { + String response = ""; + DefaultHttpClient client = new DefaultHttpClient(); + HttpGet httpGet = new HttpGet(url); + try { + HttpResponse execute = client.execute(httpGet); + InputStream content = execute.getEntity().getContent(); + + BufferedReader buffer = new BufferedReader( + new InputStreamReader(content)); + String s = ""; + //Charset cs = Charset.forName("ASCII"); // Or whatever encoding you want + + + while ((s = buffer.readLine()) != null) { + response += s; + } + + } catch (Exception e) { + e.printStackTrace(); + } + return response; + } + + + + + + /** + * Gets all parameters we can figure out about this youTubeId by scraping YouTube. + * The URL for the underlying video will have the key "location". + * @param youTubeId A YouTube ID + * @return A map with all parameters as key-value pairs. + * @throws IOException if we have networking troubles + */ + public static Map<String, String> getVideoInfo(String youTubeId) throws IOException + { + final Map<String, String> retval = new HashMap<String, String>(); + getVideoInfo(youTubeId, retval); + return retval; + } + /** + * Gets all parameters we can figure out about this youTubeId by scraping YouTube. + * The URL for the underlying video will have the key "location". + * @param youTubeId A YouTube ID + * @param map A map to fill with data; it is not cleared first. + * @throws IOException if we have networking troubles + */ + public static void getVideoInfo(String youTubeId, Map<String, String> map) throws IOException + { + final String host = "http://www.youtube.com"; + final List<IKeyValuePair> params = new ArrayList<IKeyValuePair>(); + params.add(new KeyValuePair("video_id", youTubeId)); + final String urlString = host + "/get_video_info?&"+ URLParams.generateQueryString(params); + + final URL url; + try + { + url = new URL(urlString); + } + catch (MalformedURLException e) + { + throw new RuntimeException("malformed url: " + urlString, e); + } + HttpURLConnection conn; + BufferedInputStream in; + byte[] data = new byte[4096]; // bad Art; fixed size + + conn = (HttpURLConnection)url.openConnection(); + if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) { + // badness. + conn.disconnect(); + throw new RuntimeException("could not get video info: " + urlString); + } + in = new BufferedInputStream(conn.getInputStream()); + int offset=0; + do { + offset = in.read(data, offset, data.length-offset); + } while(offset >= 0 && offset < data.length); + conn.disconnect(); + // convert to string; ugh + String response = new String(data, "UTF-8"); + System.out.println("Response: "+response); + // convert into parameter map + final Map<String, String> youTubeParams = MapUtils.listToMap(URLParams.parseQueryString(response), MapUtils.ListToMapMode.FIRST_WINS); + + + final String token = youTubeParams.get("token"); + //if (token == null) + //throw new RuntimeException("Could not find youtube token: "+ urlString +"; response="+response); + + + params.clear(); + params.add(new KeyValuePair("video_id", youTubeId)); + params.add(new KeyValuePair("t", token)); + final String location = host + "/get_video?"+URLParams.generateQueryString(params); + map.put("location", location); + map.putAll(youTubeParams); + + } +} + + diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/MenuUtilsSherlockFragmentActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/MenuUtilsSherlockFragmentActivity.java deleted file mode 100644 index ef395650..00000000 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/MenuUtilsSherlockFragmentActivity.java +++ /dev/null @@ -1,226 +0,0 @@ -/** -* Android ownCloud News -* -* @author David Luhmer -* @copyright 2013 David Luhmer david-dev@live.de -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -package de.luhmer.owncloudnewsreader.helper; - -import android.annotation.TargetApi; -import android.os.Build; -import android.preference.PreferenceManager; -import android.support.v4.app.FragmentActivity; -import android.util.Log; -import android.widget.Toast; - -import com.actionbarsherlock.app.SherlockDialogFragment; -import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuInflater; -import com.actionbarsherlock.view.MenuItem; - -import de.luhmer.owncloudnewsreader.Constants; -import de.luhmer.owncloudnewsreader.NewsReaderDetailFragment; -import de.luhmer.owncloudnewsreader.NewsReaderListActivity; -import de.luhmer.owncloudnewsreader.R; -import de.luhmer.owncloudnewsreader.VersionInfoDialogFragment; -import de.luhmer.owncloudnewsreader.database.DatabaseConnection; -import de.luhmer.owncloudnewsreader.reader.IReader; -import de.luhmer.owncloudnewsreader.reader.OnAsyncTaskCompletedListener; -import de.luhmer.owncloudnewsreader.reader.owncloud.API; -import de.luhmer.owncloudnewsreader.reader.owncloud.OwnCloud_Reader; - -public class MenuUtilsSherlockFragmentActivity extends SherlockFragmentActivity { - - protected static final String TAG = "MenuUtils"; - - static FragmentActivity activity; - - static MenuItem menuItemSettings; - static MenuItem menuItemLogin; - static MenuItem menuItemStartImageCaching; - - - private static MenuItem menuItemUpdater; - private static MenuItem menuItemDownloadMoreItems; - - static IReader _Reader; - - /** - * @return the menuItemUpdater - */ - public static MenuItem getMenuItemUpdater() { - return menuItemUpdater; - } - - - /** - * @return the menuItemDownloadMoreItems - */ - public static MenuItem getMenuItemDownloadMoreItems() { - return menuItemDownloadMoreItems; - } - - - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - @Override - protected void onResume() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - invalidateOptionsMenu(); - } - super.onResume(); - } - - - public static void onCreateOptionsMenu(Menu menu, MenuInflater inflater, FragmentActivity act) { - inflater.inflate(R.menu.news_reader, menu); - activity = act; - - menuItemSettings = menu.findItem(R.id.action_settings); - menuItemLogin = menu.findItem(R.id.action_login); - menuItemStartImageCaching = menu.findItem(R.id.menu_StartImageCaching); - - menuItemUpdater = menu.findItem(R.id.menu_update); - //menuItemMarkAllAsRead = menu.findItem(R.id.menu_markAllAsRead); - menuItemDownloadMoreItems = menu.findItem(R.id.menu_downloadMoreItems); - - - //menuItemMarkAllAsRead.setEnabled(false); - menuItemDownloadMoreItems.setEnabled(false); - - NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) activity.getSupportFragmentManager().findFragmentById(R.id.content_frame)); - if(ndf != null) - ndf.UpdateMenuItemsState(); - } - - public static boolean onOptionsItemSelected(MenuItem item, FragmentActivity activity) { - switch (item.getItemId()) { - case R.id.menu_About_Changelog: - SherlockDialogFragment dialog = new VersionInfoDialogFragment(); - dialog.show(activity.getSupportFragmentManager(), "VersionChangelogDialogFragment"); - return true; - - case R.id.menu_markAllAsRead: - NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) activity.getSupportFragmentManager().findFragmentById(R.id.content_frame)); - if(ndf != null) - { - /* - for(int i = 0; i < ndf.getListView().getChildCount(); i++) - { - View view = ndf.getListView().getChildAt(i); - CheckBox cb = (CheckBox) view.findViewById(R.id.cb_lv_item_read); - if(!cb.isChecked()) - cb.setChecked(true); - } - */ - - DatabaseConnection dbConn = new DatabaseConnection(activity); - try { - /* - //dbConn.markAllItemsAsRead(ndf.getDatabaseIdsOfItems()); - List<Integer> items = new ArrayList<Integer>(); - - - Cursor cursor = ncla.getLvAdapter().getCursor(); - cursor.moveToFirst(); - do { - items.add(Integer.parseInt(cursor.getString(0))); - } while (cursor.moveToNext()); - dbConn.markAllItemsAsRead(items); - */ - dbConn.markAllItemsAsReadForCurrentView(); - } finally { - dbConn.closeDatabase(); - } - ndf.UpdateCursor(); - - //If tablet view is enabled update the listview as well - if(activity instanceof NewsReaderListActivity) - ((NewsReaderListActivity) activity).updateAdapter(); - - } - return true; - - case R.id.menu_downloadMoreItems: - DownloadMoreItems(); - return true; - } - return false; - } - - private static void DownloadMoreItems() - { - /* - DatabaseConnection dbConn = new DatabaseConnection(activity); - int count = dbConn.getCountFeedsForFolder(SubscriptionExpandableListAdapter.ALL_ITEMS, false); - if(count >= Constants.maxItemsCount) - { - String text = activity.getString(R.string.max_items_count_reached); - text = text.replace("XX", "" + Constants.maxItemsCount); - new AlertDialog.Builder(activity) - .setTitle(activity.getString(R.string.empty_view_header)) - .setMessage(text) - .setPositiveButton(activity.getString(android.R.string.ok), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { - - } - }) - .create() - .show(); - //Toast.makeText(activity, text, Toast.LENGTH_LONG).show(); - } - else - {*/ - String username = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext()).getString("edt_username", ""); - String password = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext()).getString("edt_password", ""); - - if(username != null) { - _Reader = new OwnCloud_Reader(); - ((OwnCloud_Reader)_Reader).Start_AsyncTask_GetVersion(Constants.TaskID_GetVersion, activity, onAsyncTaskGetVersionFinished, username, password); - - Toast.makeText(activity, activity.getString(R.string.toast_GettingMoreItems), Toast.LENGTH_SHORT).show(); - } - //} - } - - static OnAsyncTaskCompletedListener onAsyncTaskGetVersionFinished = new OnAsyncTaskCompletedListener() { - - @Override - public void onAsyncTaskCompleted(int task_id, Object task_result) { - if(_Reader != null) { - String appVersion = task_result.toString(); - API api = API.GetRightApiForVersion(appVersion, activity); - ((OwnCloud_Reader) _Reader).setApi(api); - - NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) activity.getSupportFragmentManager().findFragmentById(R.id.content_frame)); - _Reader.Start_AsyncTask_GetOldItems(Constants.TaskID_GetItems, activity, onAsyncTaskComplete, ndf.getIdFeed(), ndf.getIdFolder()); - } - } - }; - - static OnAsyncTaskCompletedListener onAsyncTaskComplete = new OnAsyncTaskCompletedListener() { - @Override - public void onAsyncTaskCompleted(int task_id, Object task_result) { - NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) activity.getSupportFragmentManager().findFragmentById(R.id.content_frame)); - if(ndf != null) - ndf.UpdateCursor(); - - Log.d(TAG, "Finished Download extra items.."); - } - }; -}
\ No newline at end of file diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/SizeAnimator.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/SizeAnimator.java new file mode 100644 index 00000000..5db6f4b3 --- /dev/null +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/SizeAnimator.java @@ -0,0 +1,40 @@ +package de.luhmer.owncloudnewsreader.helper; + +import android.view.View; +import android.view.animation.Animation; +import android.view.animation.Transformation; + +/** + * Created by David on 30.06.2014. + */ +public class SizeAnimator { + + public SizeAnimator(View view, float mWidth, float mHeight, float oldWidth, float oldHeight, int duration) { + this.viewToSizeAnimate = view; + this.mWidth = mWidth; + this.mHeight = mHeight; + this.mOldHeight = oldHeight; + this.mOldWidth = oldWidth; + + sizeAnimator.setDuration(duration); + } + + View viewToSizeAnimate; + float mWidth; + float mHeight; + float mOldWidth; + float mOldHeight; + + + + public Animation sizeAnimator = new Animation() { + + @Override + protected void applyTransformation(float interpolatedTime, Transformation t) { + viewToSizeAnimate.getLayoutParams().width = (int)(mOldWidth + ((mWidth - mOldWidth) * interpolatedTime)); + viewToSizeAnimate.getLayoutParams().height = (int) (mOldHeight + ((mHeight - mOldHeight) * interpolatedTime)); + viewToSizeAnimate.setLayoutParams(viewToSizeAnimate.getLayoutParams()); + } + }; + +} |