From e92d1607eb9e71951928155cea53d65b7c665726 Mon Sep 17 00:00:00 2001 From: Renard Date: Fri, 8 Apr 2016 16:41:48 -0300 Subject: pref_transparent_sage --- .../java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java | 4 +++- app/src/main/res/xml/preferences.xml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java index 118e9c6..57aa362 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java @@ -220,7 +220,9 @@ public class ThreadListAdapter extends ArrayAdapter{ // Trasnparentar items con sage if (convertView != null){ - convertView.setAlpha(boardItem.isSage() ? 0.75F : 1.0F); + if (settings.getBoolean("pref_transparent_sage", true)){ + convertView.setAlpha(boardItem.isSage() ? 0.75F : 1.0F); + } } /* diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 7f6d5b9..459f65c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -49,6 +49,10 @@ android:entries="@array/pref_lastreplies_desc" android:entryValues="@array/pref_lastreplies_values" android:defaultValue="30"/> + -- cgit v1.2.1-18-gbd029 From fe76420bfc927ee5fc002215724c09a6d2d614c2 Mon Sep 17 00:00:00 2001 From: Renard Date: Fri, 8 Apr 2016 20:14:59 -0300 Subject: Nuevo visor de imágenes --- app/build.gradle | 5 +- .../main/java/layout/FragmentBoardItemList.java | 781 +++++++++++++++++++++ app/src/main/java/layout/FragmentImage.java | 197 ++++++ app/src/main/java/layout/fragmentThreadList.java | 779 -------------------- .../baiparser/MainActivity.java | 24 +- .../baiparser/ThreadListAdapter.java | 27 +- .../baiparser/ViewerActivity.java | 204 ++---- .../baiparser/structure/BoardItemFile.java | 49 ++ app/src/main/res/layout/activity_viewer.xml | 20 +- .../main/res/layout/fragment_fragment_image.xml | 15 + app/src/main/res/values/strings.xml | 3 + 11 files changed, 1136 insertions(+), 968 deletions(-) create mode 100644 app/src/main/java/layout/FragmentBoardItemList.java create mode 100644 app/src/main/java/layout/FragmentImage.java delete mode 100644 app/src/main/java/layout/fragmentThreadList.java create mode 100644 app/src/main/java/org/bienvenidoainternet/baiparser/structure/BoardItemFile.java create mode 100644 app/src/main/res/layout/fragment_fragment_image.xml diff --git a/app/build.gradle b/app/build.gradle index 3eaec0f..a41bd51 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.bienvenidoainternet.baiparser" minSdkVersion 15 targetSdkVersion 23 - versionCode 5 - versionName "1.5" + versionCode 6 + versionName "1.6" } buildTypes { release { @@ -30,3 +30,4 @@ dependencies { compile 'com.koushikdutta.ion:ion:2.+' } + diff --git a/app/src/main/java/layout/FragmentBoardItemList.java b/app/src/main/java/layout/FragmentBoardItemList.java new file mode 100644 index 0000000..38e4819 --- /dev/null +++ b/app/src/main/java/layout/FragmentBoardItemList.java @@ -0,0 +1,781 @@ +package layout; + +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; +import android.content.ContextWrapper; +import android.content.Intent; +import android.content.SharedPreferences; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.drawable.ColorDrawable; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; +import android.net.Uri; +import android.os.Bundle; +import android.os.Environment; +import android.preference.PreferenceManager; +import android.support.v4.app.Fragment; +import android.support.v7.view.ContextThemeWrapper; +import android.util.Log; +import android.view.ContextMenu; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AbsListView; +import android.widget.AdapterView; +import android.widget.LinearLayout; +import android.widget.ListView; +import android.widget.ProgressBar; +import android.widget.TextView; +import android.widget.Toast; + +import com.koushikdutta.async.future.FutureCallback; +import com.koushikdutta.ion.Ion; + +import org.bienvenidoainternet.baiparser.MainActivity; +import org.bienvenidoainternet.baiparser.R; +import org.bienvenidoainternet.baiparser.RecentPostAdapter; +import org.bienvenidoainternet.baiparser.ResponseActivity; +import org.bienvenidoainternet.baiparser.ThreadListAdapter; +import org.bienvenidoainternet.baiparser.structure.Board; +import org.bienvenidoainternet.baiparser.structure.BoardItem; +import org.bienvenidoainternet.baiparser.structure.ReplyID; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.List; + +public class FragmentBoardItemList extends Fragment { + public static final String ARG_CURRENTBOARD = "currentBoard", ARG_THREAD_ID = "currentThreadId", ARG_MAIN_FRAGMENT = "imMainFragment", + SAVED_BOARDITEMS = "savedBoardItems", RECENT_POST_MODE = "recentpostmode", ARG_CURRENT_THREAD = "currentThread"; + List idList = new ArrayList<>(); + public ArrayList boardItems = new ArrayList(); + public Board currentBoard = null; + public BoardItem currentThread = null; + private boolean imMainFragment; + private OnFragmentInteractionListener mListener; + private ThreadListAdapter listViewAdapter; + private RecentPostAdapter recentPostAdapter; + private ListView listViewBoardItems = null;; + private ProgressBar loadingBar = null; + SharedPreferences settings; + private boolean loadingMoreThreads = false; + View themedContext; + private int currentOffset = 0; + + ViewGroup rootView; + private boolean recentPostMode = false; + +// ProgressBar barThreadProcess; + LinearLayout layoutThreadProcess; + TextView txtThreadProcess; + + public FragmentBoardItemList() { + // Required empty public constructor + + } + + public static FragmentBoardItemList newInstance(boolean mainFragment, Board board, BoardItem thread){ + FragmentBoardItemList fragment = new FragmentBoardItemList(); + Bundle args = new Bundle(); + args.putParcelable(ARG_CURRENTBOARD, board); + args.putParcelable(ARG_CURRENT_THREAD, thread); + args.putBoolean(ARG_MAIN_FRAGMENT, mainFragment); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + this.setRetainInstance(true); + if (getArguments() != null) { + this.currentBoard = getArguments().getParcelable(ARG_CURRENTBOARD); + this.currentThread = getArguments().getParcelable(ARG_CURRENT_THREAD); + this.imMainFragment = getArguments().getBoolean(ARG_MAIN_FRAGMENT); + } + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putParcelableArrayList(SAVED_BOARDITEMS, boardItems); + outState.putBoolean(RECENT_POST_MODE, recentPostMode); + outState.putParcelable(ARG_CURRENT_THREAD, currentThread); + outState.putParcelable(ARG_CURRENTBOARD, currentBoard); + } + + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // cargamos la instancia si esta guardada + if (savedInstanceState != null){ + recentPostMode = savedInstanceState.getBoolean(RECENT_POST_MODE); + currentBoard = savedInstanceState.getParcelable(ARG_CURRENTBOARD); + currentThread = savedInstanceState.getParcelable(ARG_CURRENT_THREAD); + boardItems = savedInstanceState.getParcelableArrayList(SAVED_BOARDITEMS); + } + + // Aplicación del Tema + settings = PreferenceManager.getDefaultSharedPreferences(this.getContext()); + int themeResId = ((MainActivity)getActivity()).getCurrentThemeId(); + Context context = new ContextThemeWrapper(getActivity(), themeResId); + LayoutInflater localInflater = inflater.cloneInContext(context); + View v = localInflater.inflate(R.layout.fragment_fragment_thread_list, container, false); + themedContext = v; + this.rootView = (ViewGroup)v; + + // Seteamos los controles que son guardados globalmente + listViewBoardItems = (ListView)v.findViewById(R.id.lvThreadList); +// barThreadProcess = (ProgressBar)rootView.findViewById(R.id.barThreadProcess); + layoutThreadProcess = (LinearLayout)rootView.findViewById(R.id.layoutThreadProcess); + txtThreadProcess = (TextView)rootView.findViewById(R.id.txtThreadError); + this.loadingBar = (ProgressBar)rootView.findViewById(R.id.progressBar); + + // Agregamos color al divider del listview + ColorDrawable cd = new ColorDrawable((((MainActivity) getActivity()).themeManager).getMarginColor()); + listViewBoardItems.setDivider(cd); + listViewBoardItems.setDividerHeight(1); + + // registramos los menus del listview + registerForContextMenu(listViewBoardItems); + // Creamos los dos adaptadores y los seteamos dependiendo del modo del fragmento + listViewAdapter = new ThreadListAdapter(v.getContext(), boardItems, (((MainActivity) getActivity()).themeManager)); + recentPostAdapter = new RecentPostAdapter(v.getContext(), boardItems); + if (recentPostMode){ + listViewBoardItems.setAdapter(recentPostAdapter); + }else{ + listViewBoardItems.setAdapter(listViewAdapter); + } + + if (!imMainFragment){ + listViewAdapter.listThreads = true; + } + + listViewBoardItems.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + if (imMainFragment && !recentPostMode) { + BoardItem bi = listViewAdapter.getItem(position); + mListener.showThread(currentBoard, bi); + }else if (imMainFragment && recentPostMode){ + BoardItem bi = boardItems.get(position); + mListener.showThread(bi.getParentBoard(), bi); + } + } + }); + + listViewBoardItems.setOnScrollListener(new AbsListView.OnScrollListener() { + private int lastFirstVisibleItem = 0; + @Override + public void onScrollStateChanged(AbsListView view, int scrollState) { + + } + + @Override + public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { + if(lastFirstVisibleItem < firstVisibleItem) { // Scrolling down + mListener.hideActionButton(); + }else if(lastFirstVisibleItem > firstVisibleItem) { // Scrolling Up + mListener.showActionButton(); + } + lastFirstVisibleItem = firstVisibleItem; + for (int i = firstVisibleItem; i < firstVisibleItem + visibleItemCount; i++) { + if (!recentPostMode){ + BoardItem bi = listViewAdapter.getItem(i); + if (!bi.getThumb().isEmpty() && bi.getThumbBitmap() == null && !bi.downloadingThumb) { + getThumbnail(bi); + } + } + } +// System.out.println("[Scroll] firstItem: " + firstVisibleItem + " visible: " + visibleItemCount + " total: " + totalItemCount); + if (totalItemCount == firstVisibleItem + visibleItemCount && !loadingMoreThreads && imMainFragment && totalItemCount != 0 && !recentPostMode) { + loadingMoreThreads = true; + currentOffset += 10; + System.out.println("[Scroll] loading more threads! currentThreadCount " + totalItemCount); + getThreadList(currentOffset); // TODO: Offset incorrecto +// new TaskParseJSON(currentBoard, true).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + } + } + }); + hideProgressBar(); + if (boardItems.isEmpty()){ + if (currentBoard == null && currentThread == null && imMainFragment){ + loadRecentPost(); + }else{ + updateBoardItems(currentBoard, currentThread); + } + }else{ + listViewAdapter.notifyDataSetChanged(); + recentPostAdapter.notifyDataSetChanged(); + } + return v; + } + + private void hideProgressBar(){ + if (loadingBar != null) + loadingBar.setVisibility(View.GONE); + } + + private void showProgressBar(){ + if (loadingBar != null) + loadingBar.setVisibility(View.VISIBLE); + } + + + public void onButtonPressed(Uri uri) { + if (mListener != null) { + mListener.onFragmentInteraction(uri); + } + } + + public void updateBoardItems(Board board, BoardItem thread){ + currentBoard = board; + currentThread = thread; + + if (listViewAdapter != null){ + boardItems.clear(); + listViewAdapter.notifyDataSetChanged(); + } + if (imMainFragment){ + if (currentBoard != null) { + System.out.println("[MainFragment] Updating -> boardName: " + board.getBoardName() + " dir: " + board.getBoardDir()); + if (currentThread == null){ + System.out.println("[MainFragment] isCurrentThread null? (it should be!) " + (currentThread == null)); + } + showProgressBar(); +// new TaskParseJSON(board).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + getThreadList(0); + }else{ + System.out.println("[MainFragment] Trying to update from a null board object"); + } + }else{ + if (currentBoard != null && currentThread != null){ + System.out.println("atUpdateBoardItems ChildFragment threadID: " + currentThread.getId() + " parentID: " + currentThread.getParentId() + " boardName: " + board.getBoardName() + " " + board.getBoardDir()); + showProgressBar(); +// new TaskParseJSON(currentBoard, currentThread).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + getThreadReplies(); + }else{ + System.out.println("[childFragment] trying to update from null objects"); + System.out.println("[childFragment] isCurrentBoard null? " + (currentBoard == null)); + System.out.println("[childFragment] isCurrentThread null? " + (currentThread == null)); + } + } + } + + + + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (context instanceof OnFragmentInteractionListener) { + mListener = (OnFragmentInteractionListener) context; + } else { + throw new RuntimeException(context.toString() + + " must implement OnFragmentInteractionListener"); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + @Override + public boolean onContextItemSelected(MenuItem item) { + AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo(); + if (info.targetView.getParent() == listViewBoardItems){ + BoardItem bi = boardItems.get(info.position); + switch (item.getItemId()){ + case R.id.menu_copy: + System.out.println("Post copiado"); + ClipboardManager cm = (ClipboardManager)getActivity().getSystemService(Context.CLIPBOARD_SERVICE); + ClipData cd = ClipData.newPlainText("Reply", boardItems.get(info.position).getMessage()); + cm.setPrimaryClip(cd); + break; + case R.id.menu_reply: + Intent in = new Intent(getActivity().getApplicationContext(), ResponseActivity.class); + Bundle b = new Bundle(); + b.putParcelable("theReply", boardItems.get(info.position)); + b.putParcelable("theBoard", currentBoard); + in.putExtras(b); + getActivity().startActivity(in); + break; + case R.id.menu_savereply: + try { + File txt = new File(Environment.getExternalStorageDirectory().getPath() + "/Bai/" + bi.getParentBoard().getBoardDir() + "_" + bi.getId() + ".txt"); + FileOutputStream stream = new FileOutputStream(txt); + OutputStreamWriter outputStreamWriter = new OutputStreamWriter(stream); + outputStreamWriter.write(bi.getMessage()); + outputStreamWriter.close(); + stream.close(); + Toast.makeText(getContext(), bi.getParentBoard().getBoardDir() + "_" + bi.getId() + ".txt guardado.", Toast.LENGTH_SHORT).show(); + }catch (Exception e){ + e.printStackTrace(); + } + break; + case R.id.menu_delpost: + deletePost(false, bi); + break; + case R.id.menu_delimage: + deletePost(true, bi); + break; + } + } + return super.onContextItemSelected(item); + } + + + + @Override + public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) { + if (v.getId() == R.id.lvThreadList){ + getActivity().getMenuInflater().inflate(R.menu.menu_reply, menu); + return; + } + super.onCreateContextMenu(menu, v, menuInfo); + } + + public void refresh() { + if (recentPostMode){ + boardItems.clear(); + recentPostAdapter.notifyDataSetChanged(); + getRecentPosts(); + }else{ + updateBoardItems(currentBoard, currentThread); + } + } + + public void setRecentPostMode() { + this.recentPostMode = true; + } + + public void setCatalogMode() { + if (recentPostMode){ + boardItems.clear(); +// listViewAdapter = new ThreadListAdapter(themedContext.getContext(), boardItems, ((MainActivity)getActivity()).themeManager); + listViewBoardItems.setAdapter(listViewAdapter); + this.recentPostMode = false; + } + } + + public void loadRecentPost(){ + // Cambiamos el flag + setRecentPostMode(); + mListener.updateToolbar("Post recientes"); + // Borramos el listview + boardItems.clear(); + listViewAdapter.clear(); + listViewAdapter.notifyDataSetChanged(); + // Cargamos un nuevo adaptador. +// recentPostAdapter = new RecentPostAdapter(themedContext.getContext(), boardItems); + listViewBoardItems.setAdapter(recentPostAdapter); + // Cargamos la nueva lista + getRecentPosts(); + } + + public boolean getMode() { + return recentPostMode; + } + + + public interface OnFragmentInteractionListener { + void onFragmentInteraction(Uri uri); + void showThread(Board board, BoardItem thread); + void updateToolbar(Board currentBoard, BoardItem boardItem); + void updateToolbar(String s); + void hideActionButton(); + void showActionButton(); + } + + public void scrollToBotton(){ + if (!listViewAdapter.isEmpty()){ + listViewBoardItems.setSelection(boardItems.size()); + } + } + public void scrollToTop(){ + if (!listViewAdapter.isEmpty()){ + listViewBoardItems.setSelection(0); + } + } + + public void getThreadList(int offset){ + loadingMoreThreads = true; + showProgressBar(); + String strOffset = ""; + if (offset == 0){ + currentOffset = 0; + boardItems.clear(); + }else{ + strOffset = "&offset=" + offset; + } + setUpThreadProgess(); + + final String repliesForCatalog = settings.getString("pref_repliesperthread", "5"); + Ion.with(getContext()) + .load("http://bienvenidoainternet.org/cgi/api/list?dir=" + currentBoard.getBoardDir() + "&replies=" + repliesForCatalog + strOffset) + .setLogging("getThreadList", Log.INFO) +// .progressBar(barThreadProcess) + .noCache() + .asString() + .setCallback(new FutureCallback() { + @Override + public void onCompleted(Exception e, String result) { + hideProgressBar(); + if (e != null) { + e.printStackTrace(); + displayError(e.getMessage()); + } else { + try { + JSONObject json = new JSONObject(result); + JSONArray threads = json.getJSONArray("threads"); + for (int i = 0; i < threads.length(); i++) { + JSONObject thread = threads.getJSONObject(i); + BoardItem item = new BoardItem(); + item.setEmail(thread.getString("email")); + item.setFile(thread.getString("file")); + item.setFilesize(thread.getInt("file_size")); + item.setId(thread.getInt("id")); + item.setMessage(thread.getString("message")); + item.setName(thread.getString("name")); + item.setSubject(thread.getString("subject")); + item.setThumb(thread.getString("thumb")); + item.setThumbHeight(thread.getInt("thumb_height")); + item.setThumbWidth(thread.getInt("thumb_width")); + item.setTimeStamp(thread.getLong("timestamp")); + item.setTotalFiles(thread.getInt("total_files")); + item.setTotalReplies(thread.getInt("total_replies")); + item.setTripcode(thread.getString("tripcode")); + item.setTimeStampFormatted(thread.getString("timestamp_formatted")); + if (item.getTimeStampFormatted().contains("ID")){ + item.setPosterId(item.getTimeStampFormatted().split(" ")[1].replace("ID :", "")); + } + item.setParentBoard(currentBoard); + item.setParentId(0); + item.setIdColor(addReplyID(item.getPosterId())); + if (currentBoard.getBoardType() == 1){ + item.setBbsId(1); + } + boardItems.add(item); + if (!repliesForCatalog.equals("0")){ + JSONArray replies = thread.getJSONArray("replies"); + for (int r = 0; r < replies.length(); r++){ + JSONObject jReply = replies.getJSONObject(r); + BoardItem reply = new BoardItem(); + reply.setDeletedCode(jReply.getInt("IS_DELETED")); + if (currentBoard.getBoardType() == 1){ + reply.setBbsId(item.getTotalReplies() - (Integer.valueOf(repliesForCatalog) - r) + 2); + } + if (reply.getDeletedCode() == 0){ + reply.setEmail(jReply.getString("email")); + reply.setFile(jReply.getString("file")); + reply.setFilesize(jReply.getInt("file_size")); + reply.setId(jReply.getInt("id")); + reply.setParentId(item.getId()); + reply.setMessage(jReply.getString("message")); + reply.setName(jReply.getString("name")); + reply.setSubject(jReply.getString("subject")); + reply.setThumb(jReply.getString("thumb")); + reply.setThumbHeight(jReply.getInt("thumb_height")); + reply.setThumbWidth(jReply.getInt("thumb_width")); + reply.setTimeStamp(jReply.getLong("timestamp")); + reply.setTripcode(jReply.getString("tripcode")); + reply.setParentBoard(currentBoard); + reply.setTimeStampFormatted(jReply.getString("timestamp_formatted")); + reply.isReply = true; + if (reply.getTimeStampFormatted().contains("ID")){ + reply.setPosterId(reply.getTimeStampFormatted().split(" ")[1].replace("ID:", "")); + } + reply.setIdColor(addReplyID(reply.getPosterId())); + // + reply.setTotalReplies(item.getTotalReplies()); + }else{ + reply.setTimeStamp(jReply.getLong("timestamp")); + reply.setId(jReply.getInt("id")); + reply.isReply = true; + } + boardItems.add(reply); + } + } + } + } catch (JSONException e1) { + e1.printStackTrace(); + displayError(e1.getMessage()); + } + } + listViewAdapter.notifyDataSetChanged(); + listViewAdapter.updateBoardItems(boardItems); + loadingMoreThreads = false; + if (boardItems.isEmpty()){ + mListener.updateToolbar(currentBoard, currentThread); + } + } + }); + + + } + + private void getThreadReplies() { + showProgressBar(); + boardItems.clear(); + setUpThreadProgess(); + int limit = Integer.valueOf(settings.getString("pref_lastreplies", "1000")); + int parentTotalReplies = currentThread.getTotalReplies(); // TODO: asddas + String offset = "&offset=0"; + if (limit <= parentTotalReplies){ + offset = "&offset=" + (parentTotalReplies - limit + 1); + }else{ + limit = 1337; + } + final int finalLimit = limit; + Ion.with(getContext()) + .load("http://bienvenidoainternet.org/cgi/api/thread?id=" + currentThread.realParentId() + "&dir=" + currentThread.getParentBoard().getBoardDir() + "&limit=" + limit + offset) + .setLogging("getThreadReplies", Log.INFO) + .noCache() + .asString() + .setCallback(new FutureCallback() { + @Override + public void onCompleted(Exception e, String result) { + if (e != null){ + e.printStackTrace(); + displayError(e.getMessage()); + }else{ + try { + JSONObject json = new JSONObject(result); + JSONArray thread = json.getJSONArray("posts"); + for (int i = 0; i < thread.length(); i++){ + JSONObject reply = thread.getJSONObject(i); + BoardItem item = new BoardItem(); + item.setDeletedCode(reply.getInt("IS_DELETED")); + if (item.getDeletedCode() == 0){ + item.setEmail(reply.getString("email")); + item.setFile(reply.getString("file")); + item.setFilesize(reply.getInt("file_size")); + item.setId(reply.getInt("id")); + item.setMessage(reply.getString("message")); + item.setName(reply.getString("name")); + item.setSubject(reply.getString("subject")); + item.setThumb(reply.getString("thumb")); + item.setThumbHeight(reply.getInt("thumb_height")); + item.setThumbWidth(reply.getInt("thumb_width")); + item.setTimeStamp(reply.getLong("timestamp")); + item.setParentId(json.getInt("id")); + item.setTripcode(reply.getString("tripcode")); + item.setTimeStampFormatted(reply.getString("timestamp_formatted")); + if (item.getTimeStampFormatted().contains("ID")){ + item.setPosterId(item.getTimeStampFormatted().split(" ")[1].replace("ID:", "")); + } + item.setParentBoard(currentBoard); + item.isReply = true; + item.setIdColor(addReplyID(item.getPosterId())); + item.setTotalReplies(json.getInt("total_replies")); + if (currentBoard.getBoardType() == 1){ + if (item.getTotalReplies() < finalLimit){ + item.setBbsId(i + 1); + }else{ + item.setBbsId((item.getTotalReplies() - finalLimit + i) + 2); + } + } + + } else { + item.setId(reply.getInt("id")); + item.setTimeStamp(reply.getLong("timestamp")); + item.isReply = true; + item.setTotalReplies(json.getInt("total_replies")); + if (currentBoard.getBoardType() == 1){ + if (item.getTotalReplies() < finalLimit){ + item.setBbsId(i + 1); + }else{ + item.setBbsId((item.getTotalReplies() - finalLimit + i) + 2); + } + } + } + boardItems.add(item); + } + } catch (JSONException e1) { + e1.printStackTrace(); + displayError(e1.getMessage()); + } + } + listViewAdapter.notifyDataSetChanged(); + listViewAdapter.updateBoardItems(boardItems); + if (settings.getBoolean("setting_scrollatnewthread", true)){ + listViewBoardItems.setSelection(boardItems.size()); + mListener.showActionButton(); + } + hideProgressBar(); + } + }); + } + + private void getRecentPosts(){ + boardItems.clear(); + loadingMoreThreads = true; + setUpThreadProgess(); + String limit = settings.getString("pref_lastreplies_limit", "30"); + Ion.with(getContext()) + .load("http://bienvenidoainternet.org/cgi/api/last?limit=" + limit) + .setLogging("getRecentPosts", Log.INFO) +// .progressBar(barThreadProcess) + .noCache() + .asString() + .setCallback(new FutureCallback() { + @Override + public void onCompleted(Exception e, String result) { + if (e != null){ + e.printStackTrace(); + displayError(e.getMessage()); + }else{ + try { + JSONObject json = new JSONObject(result); + JSONArray posts = json.getJSONArray("posts"); + for (int i = 0; i < posts.length(); i++){ + JSONObject jPost = posts.getJSONObject(i); + BoardItem recentPost = new BoardItem(); + recentPost.setEmail(jPost.getString("email")); + recentPost.setFile(jPost.getString("file")); + recentPost.setFilesize(jPost.getInt("file_size")); + recentPost.setId(jPost.getInt("id")); + recentPost.setMessage(jPost.getString("message")); + recentPost.setName(jPost.getString("name")); + recentPost.setSubject(jPost.getString("subject")); + recentPost.setThumb(jPost.getString("thumb")); + recentPost.setThumbHeight(jPost.getInt("thumb_height")); + recentPost.setThumbWidth(jPost.getInt("thumb_width")); + recentPost.setTimeStamp(jPost.getLong("timestamp")); + recentPost.setTripcode(jPost.getString("tripcode")); + recentPost.setTimeStampFormatted(jPost.getString("timestamp_formatted")); + if (recentPost.getTimeStampFormatted().contains("ID")){ + recentPost.setPosterId(recentPost.getTimeStampFormatted().split(" ")[1].replace("ID:", "")); + } + recentPost.setParentBoard(((MainActivity) getActivity()).getBoardFromDir(jPost.getString("dir"))); + recentPost.setParentId(jPost.getInt("parentid")); + boardItems.add(recentPost); + } + } catch (JSONException e1) { + e1.printStackTrace(); + displayError(e1.getMessage()); + } + } + recentPostAdapter.notifyDataSetChanged(); + } + }); + + } + + private void getThumbnail(final BoardItem bi){ + bi.downloadingThumb = true; + ConnectivityManager cm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo info = cm.getActiveNetworkInfo(); + boolean usingWifi = (info != null && info.isConnected() && info.getType() == ConnectivityManager.TYPE_WIFI); + + ContextWrapper cw = new ContextWrapper(getActivity().getApplicationContext()); + File directory = cw.getDir("thumbs", Context.MODE_PRIVATE); + File mypath = new File(directory, currentBoard.getBoardDir() + "_" + bi.getThumb()); + if (mypath.exists()){ + try { + Bitmap b = BitmapFactory.decodeStream(new FileInputStream(mypath)); + bi.setThumbBitmap(b); + Log.i("getThumb", bi.getThumb() + " from cache"); + return; + }catch (Exception e){ + e.printStackTrace(); + displayError(e.getMessage()); + } + } + if (settings.getBoolean("setting_downloadOnlyWithWifi", false) == true && !usingWifi){ + Log.i("getThumb", "Not using wifi"); + return; + } + Ion.with(getContext()) + .load("http://bienvenidoainternet.org/" + bi.getParentBoard().getBoardDir() + "/thumb/" + bi.getThumb()) + .setLogging("getThumbnail", Log.INFO) + .asBitmap() + .setCallback(new FutureCallback() { + @Override + public void onCompleted(Exception e, Bitmap result) { + if (e != null) { + displayError(e.getMessage()); + e.printStackTrace(); + } else { + bi.setThumbBitmap(result); + listViewAdapter.notifyDataSetChanged(); + } + } + }); + } + + private void deletePost(final boolean imageOnly, BoardItem reply) { + String password = settings.getString("pref_password", "12345678"); + Ion.with(getContext()) + .load("http://bienvenidoainternet.org/cgi/api/delete?dir=" + currentThread.getParentBoard().getBoardDir() + "&id=" + reply.getId() + "&password=" + password + "&imageonly=" + (imageOnly ? 1 : 0)) + .setLogging("deletePost", Log.INFO) + .asString() + .setCallback(new FutureCallback() { + @Override + public void onCompleted(Exception e, String result) { + if (e != null) { + e.printStackTrace(); + displayError(e.getMessage()); + } else { + JSONObject json = null; + try { + json = new JSONObject(result); + if (json.getString("state").equals("success")) { + Toast.makeText(getContext(), imageOnly ? "Imágen" : "Respuesta" + " eliminada", Toast.LENGTH_LONG).show(); + } else { + Toast.makeText(getContext(), URLDecoder.decode(json.getString("message"), "UTF-8"), Toast.LENGTH_LONG).show(); + } + } catch (JSONException e1) { + e1.printStackTrace(); + displayError(e1.getMessage()); + } catch (UnsupportedEncodingException e1) { + e1.printStackTrace(); + displayError(e1.getMessage()); + } + } + } + }); + } + + + + public int addReplyID(String s){ + if (!idList.contains(new ReplyID(s))){ + idList.add(new ReplyID(s)); + } + for (ReplyID r : idList){ + if (r.id.equals(s)){return r.color;} + } + return 0; + } + + private void setUpThreadProgess(){ +// barThreadProcess.setVisibility(View.VISIBLE); + txtThreadProcess.setVisibility(View.GONE); + layoutThreadProcess.setVisibility(View.VISIBLE); + } + + private void displayError(String error){ + hideProgressBar(); + if (error != null){ + layoutThreadProcess.setVisibility(View.VISIBLE); + txtThreadProcess.setVisibility(View.VISIBLE); + txtThreadProcess.setText("( ; u ; )　\r\n/!\\ ERROR\r\n" + error); + } + + } +} diff --git a/app/src/main/java/layout/FragmentImage.java b/app/src/main/java/layout/FragmentImage.java new file mode 100644 index 0000000..399e9f3 --- /dev/null +++ b/app/src/main/java/layout/FragmentImage.java @@ -0,0 +1,197 @@ +package layout; + +import android.content.Context; +import android.content.ContextWrapper; +import android.net.Uri; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ProgressBar; +import android.widget.TextView; + +import com.davemorrissey.labs.subscaleview.ImageSource; +import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; +import com.koushikdutta.async.future.FutureCallback; +import com.koushikdutta.ion.Ion; + +import org.bienvenidoainternet.baiparser.R; +import org.bienvenidoainternet.baiparser.ViewerActivity; +import org.bienvenidoainternet.baiparser.structure.BoardItem; +import org.bienvenidoainternet.baiparser.structure.BoardItemFile; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; + +import pl.droidsonroids.gif.GifDrawable; +import pl.droidsonroids.gif.GifImageView; + +/** + * A simple {@link Fragment} subclass. + * Activities that contain this fragment must implement the + * {@link FragmentImage.OnFragmentInteractionListener} interface + * to handle interaction events. + * Use the {@link FragmentImage#newInstance} factory method to + * create an instance of this fragment. + */ +public class FragmentImage extends Fragment { + private static final String ARG_BOARD_ITEM = "param1"; + + public BoardItemFile boardItemFile; + + private OnFragmentInteractionListener mListener; + private SubsamplingScaleImageView imageView; + private GifImageView gifView; + private static final String ARG_FILE_URL = "fileURL"; + private ProgressBar downloadBar; + + public FragmentImage() { + // Required empty public constructor + } + + public static FragmentImage newInstance(BoardItemFile boardItemFile) { + FragmentImage fragment = new FragmentImage(); + Bundle args = new Bundle(); + args.putParcelable(ARG_BOARD_ITEM, boardItemFile); +// args.putString(ARG_FILE_URL, file); + fragment.setArguments(args); + Log.v("FragmentImage", fragment.toString() + " new Fragment"); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { +// currentThread = getArguments().getParcelable(ARG_BOARD_ITEM); + boardItemFile = getArguments().getParcelable(ARG_BOARD_ITEM); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View view = inflater.inflate(R.layout.fragment_fragment_image, container, false); + imageView = (SubsamplingScaleImageView) view.findViewById(R.id.imageView); + gifView = (GifImageView) view.findViewById(R.id.gifView); + imageView.setVisibility(View.GONE); + gifView.setVisibility(View.GONE); + if (boardItemFile.file != null) { + if (!boardItemFile.file.endsWith(".webm") && !boardItemFile.file.endsWith(".swf")) { + downloadFile(); + } + } + return view; + } + + // TODO: Rename method, update argument and hook method into UI event + public void onButtonPressed(Uri uri) { + if (mListener != null) { + mListener.onFragmentInteraction(uri); + } + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (context instanceof OnFragmentInteractionListener) { + mListener = (OnFragmentInteractionListener) context; + } else { + throw new RuntimeException(context.toString() + + " must implement OnFragmentInteractionListener"); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + public void setDownloadBar(ProgressBar downloadBar) { + this.downloadBar = downloadBar; + } + + /** + * This interface must be implemented by activities that contain this + * fragment to allow an interaction in this fragment to be communicated + * to the activity and potentially other fragments contained in that + * activity. + *

+ * See the Android Training lesson Communicating with Other Fragments for more information. + */ + public interface OnFragmentInteractionListener { + // TODO: Update argument type and name + void onFragmentInteraction(Uri uri); + } + + private void downloadFile() { + downloadBar = ((ViewerActivity)getActivity()).barDownload; + downloadBar.setVisibility(View.VISIBLE); + ContextWrapper cw = new ContextWrapper(getContext()); + File directory = cw.getDir("src", Context.MODE_PRIVATE); + final File filePath = new File(directory, boardItemFile.boardDir + "_" + boardItemFile.file); + if (filePath.exists()) { + downloadBar.setVisibility(View.GONE); + if (boardItemFile.file.endsWith(".gif")) { + try { + GifDrawable gifFromFile = new GifDrawable(filePath); + gifView.setImageDrawable(gifFromFile); + gifView.setVisibility(View.VISIBLE); + imageView.setVisibility(View.GONE); + } catch (Exception e) { + e.printStackTrace(); + } + } else { + imageView.setImage(ImageSource.uri(filePath.toURI().getPath())); + imageView.setVisibility(View.VISIBLE); + gifView.setVisibility(View.GONE); + } + } + Ion.with(getContext()) + .load(boardItemFile.fileURL) + .progressBar(downloadBar) + .asInputStream() + .setCallback(new FutureCallback() { + @Override + public void onCompleted(Exception e, InputStream result) { + downloadBar.setVisibility(View.GONE); + if (e != null) { + e.printStackTrace(); + } else { + FileOutputStream fout; + try { + fout = new FileOutputStream(filePath); + final byte data[] = new byte[1024]; + int count; + while ((count = result.read(data, 0, 1024)) != -1) { + fout.write(data, 0, count); + } + } catch (Exception e1) { + e1.printStackTrace(); + } + if (boardItemFile.file.endsWith(".gif")) { + try { + GifDrawable gifFromFile = new GifDrawable(filePath); + gifView.setImageDrawable(gifFromFile); + gifView.setVisibility(View.VISIBLE); + imageView.setVisibility(View.GONE); + } catch (Exception e2) { + e2.printStackTrace(); + } + } else { + imageView.setImage(ImageSource.uri(filePath.toURI().getPath())); + gifView.setVisibility(View.GONE); + imageView.setVisibility(View.VISIBLE); + } + } + } + }); + } +} diff --git a/app/src/main/java/layout/fragmentThreadList.java b/app/src/main/java/layout/fragmentThreadList.java deleted file mode 100644 index c06fd93..0000000 --- a/app/src/main/java/layout/fragmentThreadList.java +++ /dev/null @@ -1,779 +0,0 @@ -package layout; - -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Context; -import android.content.ContextWrapper; -import android.content.Intent; -import android.content.SharedPreferences; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.drawable.ColorDrawable; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.net.Uri; -import android.os.Bundle; -import android.os.Environment; -import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; -import android.support.v7.view.ContextThemeWrapper; -import android.util.Log; -import android.view.ContextMenu; -import android.view.LayoutInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.widget.AbsListView; -import android.widget.AdapterView; -import android.widget.LinearLayout; -import android.widget.ListView; -import android.widget.ProgressBar; -import android.widget.TextView; -import android.widget.Toast; - -import com.koushikdutta.async.future.FutureCallback; -import com.koushikdutta.ion.Ion; - -import org.bienvenidoainternet.baiparser.MainActivity; -import org.bienvenidoainternet.baiparser.R; -import org.bienvenidoainternet.baiparser.RecentPostAdapter; -import org.bienvenidoainternet.baiparser.ResponseActivity; -import org.bienvenidoainternet.baiparser.ThreadListAdapter; -import org.bienvenidoainternet.baiparser.structure.Board; -import org.bienvenidoainternet.baiparser.structure.BoardItem; -import org.bienvenidoainternet.baiparser.structure.ReplyID; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.List; - -public class fragmentThreadList extends Fragment { - public static final String ARG_CURRENTBOARD = "currentBoard", ARG_THREAD_ID = "currentThreadId", ARG_MAIN_FRAGMENT = "imMainFragment", - SAVED_BOARDITEMS = "savedBoardItems", RECENT_POST_MODE = "recentpostmode", ARG_CURRENT_THREAD = "currentThread"; - List idList = new ArrayList<>(); - public ArrayList boardItems = new ArrayList(); - public Board currentBoard = null; - public BoardItem currentThread = null; - private boolean imMainFragment; - private OnFragmentInteractionListener mListener; - private ThreadListAdapter listViewAdapter; - private RecentPostAdapter recentPostAdapter; - private ListView listViewBoardItems = null;; - private ProgressBar loadingBar = null; - SharedPreferences settings; - private boolean loadingMoreThreads = false; - View themedContext; - private int currentOffset = 0; - - ViewGroup rootView; - private boolean recentPostMode = false; - -// ProgressBar barThreadProcess; - LinearLayout layoutThreadProcess; - TextView txtThreadProcess; - - public fragmentThreadList() { - // Required empty public constructor - - } - - public static fragmentThreadList newInstance(boolean mainFragment, Board board, BoardItem thread){ - fragmentThreadList fragment = new fragmentThreadList(); - Bundle args = new Bundle(); - args.putParcelable(ARG_CURRENTBOARD, board); - args.putParcelable(ARG_CURRENT_THREAD, thread); - args.putBoolean(ARG_MAIN_FRAGMENT, mainFragment); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - this.setRetainInstance(true); - if (getArguments() != null) { - this.currentBoard = getArguments().getParcelable(ARG_CURRENTBOARD); - this.currentThread = getArguments().getParcelable(ARG_CURRENT_THREAD); - this.imMainFragment = getArguments().getBoolean(ARG_MAIN_FRAGMENT); - } - } - - @Override - public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putParcelableArrayList(SAVED_BOARDITEMS, boardItems); - outState.putBoolean(RECENT_POST_MODE, recentPostMode); - outState.putParcelable(ARG_CURRENT_THREAD, currentThread); - outState.putParcelable(ARG_CURRENTBOARD, currentBoard); - } - - - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // cargamos la instancia si esta guardada - if (savedInstanceState != null){ - recentPostMode = savedInstanceState.getBoolean(RECENT_POST_MODE); - currentBoard = savedInstanceState.getParcelable(ARG_CURRENTBOARD); - currentThread = savedInstanceState.getParcelable(ARG_CURRENT_THREAD); - boardItems = savedInstanceState.getParcelableArrayList(SAVED_BOARDITEMS); - } - - // Aplicación del Tema - settings = PreferenceManager.getDefaultSharedPreferences(this.getContext()); - int themeResId = ((MainActivity)getActivity()).getCurrentThemeId(); - Context context = new ContextThemeWrapper(getActivity(), themeResId); - LayoutInflater localInflater = inflater.cloneInContext(context); - View v = localInflater.inflate(R.layout.fragment_fragment_thread_list, container, false); - themedContext = v; - this.rootView = (ViewGroup)v; - - // Seteamos los controles que son guardados globalmente - listViewBoardItems = (ListView)v.findViewById(R.id.lvThreadList); -// barThreadProcess = (ProgressBar)rootView.findViewById(R.id.barThreadProcess); - layoutThreadProcess = (LinearLayout)rootView.findViewById(R.id.layoutThreadProcess); - txtThreadProcess = (TextView)rootView.findViewById(R.id.txtThreadError); - this.loadingBar = (ProgressBar)rootView.findViewById(R.id.progressBar); - - // Agregamos color al divider del listview - ColorDrawable cd = new ColorDrawable((((MainActivity) getActivity()).themeManager).getMarginColor()); - listViewBoardItems.setDivider(cd); - listViewBoardItems.setDividerHeight(1); - - // registramos los menus del listview - registerForContextMenu(listViewBoardItems); - // Creamos los dos adaptadores y los seteamos dependiendo del modo del fragmento - listViewAdapter = new ThreadListAdapter(v.getContext(), boardItems, (((MainActivity) getActivity()).themeManager)); - recentPostAdapter = new RecentPostAdapter(v.getContext(), boardItems); - if (recentPostMode){ - listViewBoardItems.setAdapter(recentPostAdapter); - }else{ - listViewBoardItems.setAdapter(listViewAdapter); - } - - if (!imMainFragment){ - listViewAdapter.listThreads = true; - } - - listViewBoardItems.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - if (imMainFragment && !recentPostMode) { - BoardItem bi = listViewAdapter.getItem(position); - mListener.showThread(currentBoard, bi); - }else if (imMainFragment && recentPostMode){ - BoardItem bi = boardItems.get(position); - mListener.showThread(bi.getParentBoard(), bi); - } - } - }); - - listViewBoardItems.setOnScrollListener(new AbsListView.OnScrollListener() { - private int lastFirstVisibleItem = 0; - @Override - public void onScrollStateChanged(AbsListView view, int scrollState) { - - } - - @Override - public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { - if(lastFirstVisibleItem < firstVisibleItem) { // Scrolling down - mListener.hideActionButton(); - }else if(lastFirstVisibleItem > firstVisibleItem) { // Scrolling Up - mListener.showActionButton(); - } - lastFirstVisibleItem = firstVisibleItem; - for (int i = firstVisibleItem; i < firstVisibleItem + visibleItemCount; i++) { - if (!recentPostMode){ - BoardItem bi = listViewAdapter.getItem(i); - if (!bi.getThumb().isEmpty() && bi.getThumbBitmap() == null && !bi.downloadingThumb) { - getThumbnail(bi); - } - } - } -// System.out.println("[Scroll] firstItem: " + firstVisibleItem + " visible: " + visibleItemCount + " total: " + totalItemCount); - if (totalItemCount == firstVisibleItem + visibleItemCount && !loadingMoreThreads && imMainFragment && totalItemCount != 0 && !recentPostMode) { - loadingMoreThreads = true; - currentOffset += 10; - System.out.println("[Scroll] loading more threads! currentThreadCount " + totalItemCount); - getThreadList(currentOffset); // TODO: Offset incorrecto -// new TaskParseJSON(currentBoard, true).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - } - }); - hideProgressBar(); - if (boardItems.isEmpty()){ - if (currentBoard == null && currentThread == null && imMainFragment){ - loadRecentPost(); - }else{ - updateBoardItems(currentBoard, currentThread); - } - }else{ - listViewAdapter.notifyDataSetChanged(); - recentPostAdapter.notifyDataSetChanged(); - } - return v; - } - - private void hideProgressBar(){ - if (loadingBar != null) - loadingBar.setVisibility(View.GONE); - } - - private void showProgressBar(){ - if (loadingBar != null) - loadingBar.setVisibility(View.VISIBLE); - } - - - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - public void updateBoardItems(Board board, BoardItem thread){ - currentBoard = board; - currentThread = thread; - - if (listViewAdapter != null){ - boardItems.clear(); - listViewAdapter.notifyDataSetChanged(); - } - if (imMainFragment){ - if (currentBoard != null) { - System.out.println("[MainFragment] Updating -> boardName: " + board.getBoardName() + " dir: " + board.getBoardDir()); - if (currentThread == null){ - System.out.println("[MainFragment] isCurrentThread null? (it should be!) " + (currentThread == null)); - } - showProgressBar(); -// new TaskParseJSON(board).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - getThreadList(0); - }else{ - System.out.println("[MainFragment] Trying to update from a null board object"); - } - }else{ - if (currentBoard != null && currentThread != null){ - System.out.println("atUpdateBoardItems ChildFragment threadID: " + currentThread.getId() + " parentID: " + currentThread.getParentId() + " boardName: " + board.getBoardName() + " " + board.getBoardDir()); - showProgressBar(); -// new TaskParseJSON(currentBoard, currentThread).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - getThreadReplies(); - }else{ - System.out.println("[childFragment] trying to update from null objects"); - System.out.println("[childFragment] isCurrentBoard null? " + (currentBoard == null)); - System.out.println("[childFragment] isCurrentThread null? " + (currentThread == null)); - } - } - } - - - - @Override - public void onAttach(Context context) { - super.onAttach(context); - if (context instanceof OnFragmentInteractionListener) { - mListener = (OnFragmentInteractionListener) context; - } else { - throw new RuntimeException(context.toString() - + " must implement OnFragmentInteractionListener"); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - @Override - public boolean onContextItemSelected(MenuItem item) { - AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo(); - if (info.targetView.getParent() == listViewBoardItems){ - BoardItem bi = boardItems.get(info.position); - switch (item.getItemId()){ - case R.id.menu_copy: - System.out.println("Post copiado"); - ClipboardManager cm = (ClipboardManager)getActivity().getSystemService(Context.CLIPBOARD_SERVICE); - ClipData cd = ClipData.newPlainText("Reply", boardItems.get(info.position).getMessage()); - cm.setPrimaryClip(cd); - break; - case R.id.menu_reply: - Intent in = new Intent(getActivity().getApplicationContext(), ResponseActivity.class); - Bundle b = new Bundle(); - b.putParcelable("theReply", boardItems.get(info.position)); - b.putParcelable("theBoard", currentBoard); - in.putExtras(b); - getActivity().startActivity(in); - break; - case R.id.menu_savereply: - try { - File txt = new File(Environment.getExternalStorageDirectory().getPath() + "/Bai/" + bi.getParentBoard().getBoardDir() + "_" + bi.getId() + ".txt"); - FileOutputStream stream = new FileOutputStream(txt); - OutputStreamWriter outputStreamWriter = new OutputStreamWriter(stream); - outputStreamWriter.write(bi.getMessage()); - outputStreamWriter.close(); - stream.close(); - Toast.makeText(getContext(), bi.getParentBoard().getBoardDir() + "_" + bi.getId() + ".txt guardado.", Toast.LENGTH_SHORT).show(); - }catch (Exception e){ - e.printStackTrace(); - } - break; - case R.id.menu_delpost: - deletePost(false, bi); - break; - case R.id.menu_delimage: - deletePost(true, bi); - break; - } - } - return super.onContextItemSelected(item); - } - - - - @Override - public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) { - if (v.getId() == R.id.lvThreadList){ - getActivity().getMenuInflater().inflate(R.menu.menu_reply, menu); - return; - } - super.onCreateContextMenu(menu, v, menuInfo); - } - - public void refresh() { - if (recentPostMode){ - boardItems.clear(); - recentPostAdapter.notifyDataSetChanged(); - getRecentPosts(); - }else{ - updateBoardItems(currentBoard, currentThread); - } - } - - public void setRecentPostMode() { - this.recentPostMode = true; - } - - public void setCatalogMode() { - if (recentPostMode){ - boardItems.clear(); -// listViewAdapter = new ThreadListAdapter(themedContext.getContext(), boardItems, ((MainActivity)getActivity()).themeManager); - listViewBoardItems.setAdapter(listViewAdapter); - this.recentPostMode = false; - } - } - - public void loadRecentPost(){ - // Cambiamos el flag - setRecentPostMode(); - mListener.updateToolbar("Post recientes"); - // Borramos el listview - boardItems.clear(); - listViewAdapter.clear(); - listViewAdapter.notifyDataSetChanged(); - // Cargamos un nuevo adaptador. -// recentPostAdapter = new RecentPostAdapter(themedContext.getContext(), boardItems); - listViewBoardItems.setAdapter(recentPostAdapter); - // Cargamos la nueva lista - getRecentPosts(); - } - - public boolean getMode() { - return recentPostMode; - } - - - public interface OnFragmentInteractionListener { - void onFragmentInteraction(Uri uri); - void showThread(Board board, BoardItem thread); - void updateToolbar(Board currentBoard, BoardItem boardItem); - void updateToolbar(String s); - void hideActionButton(); - void showActionButton(); - } - - public void scrollToBotton(){ - if (!listViewAdapter.isEmpty()){ - listViewBoardItems.setSelection(boardItems.size()); - } - } - public void scrollToTop(){ - if (!listViewAdapter.isEmpty()){ - listViewBoardItems.setSelection(0); - } - } - - public void getThreadList(int offset){ - loadingMoreThreads = true; - showProgressBar(); - String strOffset = ""; - if (offset == 0){ - currentOffset = 0; - boardItems.clear(); - }else{ - strOffset = "&offset=" + offset; - } - setUpThreadProgess(); - - final String repliesForCatalog = settings.getString("pref_repliesperthread", "5"); - Ion.with(getContext()) - .load("http://bienvenidoainternet.org/cgi/api/list?dir=" + currentBoard.getBoardDir() + "&replies=" + repliesForCatalog + strOffset) - .setLogging("getThreadList", Log.INFO) -// .progressBar(barThreadProcess) - .noCache() - .asString() - .setCallback(new FutureCallback() { - @Override - public void onCompleted(Exception e, String result) { - hideProgressBar(); - if (e != null) { - e.printStackTrace(); - displayError(e.getMessage()); - } else { - try { - JSONObject json = new JSONObject(result); - JSONArray threads = json.getJSONArray("threads"); - for (int i = 0; i < threads.length(); i++) { - JSONObject thread = threads.getJSONObject(i); - BoardItem item = new BoardItem(); - item.setEmail(thread.getString("email")); - item.setFile(thread.getString("file")); - item.setFilesize(thread.getInt("file_size")); - item.setId(thread.getInt("id")); - item.setMessage(thread.getString("message")); - item.setName(thread.getString("name")); - item.setSubject(thread.getString("subject")); - item.setThumb(thread.getString("thumb")); - item.setThumbHeight(thread.getInt("thumb_height")); - item.setThumbWidth(thread.getInt("thumb_width")); - item.setTimeStamp(thread.getLong("timestamp")); - item.setTotalFiles(thread.getInt("total_files")); - item.setTotalReplies(thread.getInt("total_replies")); - item.setTripcode(thread.getString("tripcode")); - item.setTimeStampFormatted(thread.getString("timestamp_formatted")); - if (item.getTimeStampFormatted().contains("ID")){ - item.setPosterId(item.getTimeStampFormatted().split(" ")[1].replace("ID :", "")); - } - item.setParentBoard(currentBoard); - item.setParentId(0); - item.setIdColor(addReplyID(item.getPosterId())); - if (currentBoard.getBoardType() == 1){ - item.setBbsId(1); - } - boardItems.add(item); - if (!repliesForCatalog.equals("0")){ - JSONArray replies = thread.getJSONArray("replies"); - for (int r = 0; r < replies.length(); r++){ - JSONObject jReply = replies.getJSONObject(r); - BoardItem reply = new BoardItem(); - reply.setDeletedCode(jReply.getInt("IS_DELETED")); - if (currentBoard.getBoardType() == 1){ - reply.setBbsId(item.getTotalReplies() - (Integer.valueOf(repliesForCatalog) - r) + 2); - } - if (reply.getDeletedCode() == 0){ - reply.setEmail(jReply.getString("email")); - reply.setFile(jReply.getString("file")); - reply.setFilesize(jReply.getInt("file_size")); - reply.setId(jReply.getInt("id")); - reply.setParentId(item.getId()); - reply.setMessage(jReply.getString("message")); - reply.setName(jReply.getString("name")); - reply.setSubject(jReply.getString("subject")); - reply.setThumb(jReply.getString("thumb")); - reply.setThumbHeight(jReply.getInt("thumb_height")); - reply.setThumbWidth(jReply.getInt("thumb_width")); - reply.setTimeStamp(jReply.getLong("timestamp")); - reply.setTripcode(jReply.getString("tripcode")); - reply.setParentBoard(currentBoard); - reply.setTimeStampFormatted(jReply.getString("timestamp_formatted")); - reply.isReply = true; - if (reply.getTimeStampFormatted().contains("ID")){ - reply.setPosterId(reply.getTimeStampFormatted().split(" ")[1].replace("ID:", "")); - } - reply.setIdColor(addReplyID(reply.getPosterId())); - // - reply.setTotalReplies(item.getTotalReplies()); - }else{ - reply.setTimeStamp(jReply.getLong("timestamp")); - reply.setId(jReply.getInt("id")); - reply.isReply = true; - } - boardItems.add(reply); - } - } - } - } catch (JSONException e1) { - e1.printStackTrace(); - displayError(e1.getMessage()); - } - } - listViewAdapter.notifyDataSetChanged(); - loadingMoreThreads = false; - if (boardItems.isEmpty()){ - mListener.updateToolbar(currentBoard, currentThread); - } - } - }); - - - } - - private void getThreadReplies() { - showProgressBar(); - boardItems.clear(); - setUpThreadProgess(); - int limit = Integer.valueOf(settings.getString("pref_lastreplies", "1000")); - int parentTotalReplies = currentThread.getTotalReplies(); // TODO: asddas - String offset = "&offset=0"; - if (limit <= parentTotalReplies){ - offset = "&offset=" + (parentTotalReplies - limit + 1); - }else{ - limit = 1337; - } - final int finalLimit = limit; - Ion.with(getContext()) - .load("http://bienvenidoainternet.org/cgi/api/thread?id=" + currentThread.realParentId() + "&dir=" + currentThread.getParentBoard().getBoardDir() + "&limit=" + limit + offset) - .setLogging("getThreadReplies", Log.INFO) - .noCache() - .asString() - .setCallback(new FutureCallback() { - @Override - public void onCompleted(Exception e, String result) { - if (e != null){ - e.printStackTrace(); - displayError(e.getMessage()); - }else{ - try { - JSONObject json = new JSONObject(result); - JSONArray thread = json.getJSONArray("posts"); - for (int i = 0; i < thread.length(); i++){ - JSONObject reply = thread.getJSONObject(i); - BoardItem item = new BoardItem(); - item.setDeletedCode(reply.getInt("IS_DELETED")); - if (item.getDeletedCode() == 0){ - item.setEmail(reply.getString("email")); - item.setFile(reply.getString("file")); - item.setFilesize(reply.getInt("file_size")); - item.setId(reply.getInt("id")); - item.setMessage(reply.getString("message")); - item.setName(reply.getString("name")); - item.setSubject(reply.getString("subject")); - item.setThumb(reply.getString("thumb")); - item.setThumbHeight(reply.getInt("thumb_height")); - item.setThumbWidth(reply.getInt("thumb_width")); - item.setTimeStamp(reply.getLong("timestamp")); - item.setParentId(json.getInt("id")); - item.setTripcode(reply.getString("tripcode")); - item.setTimeStampFormatted(reply.getString("timestamp_formatted")); - if (item.getTimeStampFormatted().contains("ID")){ - item.setPosterId(item.getTimeStampFormatted().split(" ")[1].replace("ID:", "")); - } - item.setParentBoard(currentBoard); - item.isReply = true; - item.setIdColor(addReplyID(item.getPosterId())); - item.setTotalReplies(json.getInt("total_replies")); - if (currentBoard.getBoardType() == 1){ - if (item.getTotalReplies() < finalLimit){ - item.setBbsId(i + 1); - }else{ - item.setBbsId((item.getTotalReplies() - finalLimit + i) + 2); - } - } - - } else { - item.setId(reply.getInt("id")); - item.setTimeStamp(reply.getLong("timestamp")); - item.isReply = true; - item.setTotalReplies(json.getInt("total_replies")); - if (currentBoard.getBoardType() == 1){ - if (item.getTotalReplies() < finalLimit){ - item.setBbsId(i + 1); - }else{ - item.setBbsId((item.getTotalReplies() - finalLimit + i) + 2); - } - } - } - boardItems.add(item); - } - } catch (JSONException e1) { - e1.printStackTrace(); - displayError(e1.getMessage()); - } - } - listViewAdapter.notifyDataSetChanged(); - if (settings.getBoolean("setting_scrollatnewthread", true)){ - listViewBoardItems.setSelection(boardItems.size()); - mListener.showActionButton(); - } - hideProgressBar(); - } - }); - } - - private void getRecentPosts(){ - boardItems.clear(); - loadingMoreThreads = true; - setUpThreadProgess(); - String limit = settings.getString("pref_lastreplies_limit", "30"); - Ion.with(getContext()) - .load("http://bienvenidoainternet.org/cgi/api/last?limit=" + limit) - .setLogging("getRecentPosts", Log.INFO) -// .progressBar(barThreadProcess) - .noCache() - .asString() - .setCallback(new FutureCallback() { - @Override - public void onCompleted(Exception e, String result) { - if (e != null){ - e.printStackTrace(); - displayError(e.getMessage()); - }else{ - try { - JSONObject json = new JSONObject(result); - JSONArray posts = json.getJSONArray("posts"); - for (int i = 0; i < posts.length(); i++){ - JSONObject jPost = posts.getJSONObject(i); - BoardItem recentPost = new BoardItem(); - recentPost.setEmail(jPost.getString("email")); - recentPost.setFile(jPost.getString("file")); - recentPost.setFilesize(jPost.getInt("file_size")); - recentPost.setId(jPost.getInt("id")); - recentPost.setMessage(jPost.getString("message")); - recentPost.setName(jPost.getString("name")); - recentPost.setSubject(jPost.getString("subject")); - recentPost.setThumb(jPost.getString("thumb")); - recentPost.setThumbHeight(jPost.getInt("thumb_height")); - recentPost.setThumbWidth(jPost.getInt("thumb_width")); - recentPost.setTimeStamp(jPost.getLong("timestamp")); - recentPost.setTripcode(jPost.getString("tripcode")); - recentPost.setTimeStampFormatted(jPost.getString("timestamp_formatted")); - if (recentPost.getTimeStampFormatted().contains("ID")){ - recentPost.setPosterId(recentPost.getTimeStampFormatted().split(" ")[1].replace("ID:", "")); - } - recentPost.setParentBoard(((MainActivity) getActivity()).getBoardFromDir(jPost.getString("dir"))); - recentPost.setParentId(jPost.getInt("parentid")); - boardItems.add(recentPost); - } - } catch (JSONException e1) { - e1.printStackTrace(); - displayError(e1.getMessage()); - } - } - recentPostAdapter.notifyDataSetChanged(); - } - }); - - } - - private void getThumbnail(final BoardItem bi){ - bi.downloadingThumb = true; - ConnectivityManager cm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo info = cm.getActiveNetworkInfo(); - boolean usingWifi = (info != null && info.isConnected() && info.getType() == ConnectivityManager.TYPE_WIFI); - - ContextWrapper cw = new ContextWrapper(getActivity().getApplicationContext()); - File directory = cw.getDir("thumbs", Context.MODE_PRIVATE); - File mypath = new File(directory, currentBoard.getBoardDir() + "_" + bi.getThumb()); - if (mypath.exists()){ - try { - Bitmap b = BitmapFactory.decodeStream(new FileInputStream(mypath)); - bi.setThumbBitmap(b); - Log.i("getThumb", bi.getThumb() + " from cache"); - return; - }catch (Exception e){ - e.printStackTrace(); - displayError(e.getMessage()); - } - } - if (settings.getBoolean("setting_downloadOnlyWithWifi", false) == true && !usingWifi){ - Log.i("getThumb", "Not using wifi"); - return; - } - Ion.with(getContext()) - .load("http://bienvenidoainternet.org/" + bi.getParentBoard().getBoardDir() + "/thumb/" + bi.getThumb()) - .setLogging("getThumbnail", Log.INFO) - .asBitmap() - .setCallback(new FutureCallback() { - @Override - public void onCompleted(Exception e, Bitmap result) { - if (e != null) { - displayError(e.getMessage()); - e.printStackTrace(); - } else { - bi.setThumbBitmap(result); - listViewAdapter.notifyDataSetChanged(); - } - } - }); - } - - private void deletePost(final boolean imageOnly, BoardItem reply) { - String password = settings.getString("pref_password", "12345678"); - Ion.with(getContext()) - .load("http://bienvenidoainternet.org/cgi/api/delete?dir=" + currentThread.getParentBoard().getBoardDir() + "&id=" + reply.getId() + "&password=" + password + "&imageonly=" + (imageOnly ? 1 : 0)) - .setLogging("deletePost", Log.INFO) - .asString() - .setCallback(new FutureCallback() { - @Override - public void onCompleted(Exception e, String result) { - if (e != null) { - e.printStackTrace(); - displayError(e.getMessage()); - } else { - JSONObject json = null; - try { - json = new JSONObject(result); - if (json.getString("state").equals("success")) { - Toast.makeText(getContext(), imageOnly ? "Imágen" : "Respuesta" + " eliminada", Toast.LENGTH_LONG).show(); - } else { - Toast.makeText(getContext(), URLDecoder.decode(json.getString("message"), "UTF-8"), Toast.LENGTH_LONG).show(); - } - } catch (JSONException e1) { - e1.printStackTrace(); - displayError(e1.getMessage()); - } catch (UnsupportedEncodingException e1) { - e1.printStackTrace(); - displayError(e1.getMessage()); - } - } - } - }); - } - - - - public int addReplyID(String s){ - if (!idList.contains(new ReplyID(s))){ - idList.add(new ReplyID(s)); - } - for (ReplyID r : idList){ - if (r.id.equals(s)){return r.color;} - } - return 0; - } - - private void setUpThreadProgess(){ -// barThreadProcess.setVisibility(View.VISIBLE); - txtThreadProcess.setVisibility(View.GONE); - layoutThreadProcess.setVisibility(View.VISIBLE); - } - - private void displayError(String error){ - hideProgressBar(); - if (error != null){ - layoutThreadProcess.setVisibility(View.VISIBLE); - txtThreadProcess.setVisibility(View.VISIBLE); - txtThreadProcess.setText("( ; u ; )　\r\n/!\\ ERROR\r\n" + error); - } - - } -} diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java index 65b51e2..9130160 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java @@ -3,13 +3,11 @@ package org.bienvenidoainternet.baiparser; import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.NavigationView; -import android.support.design.widget.Snackbar; import android.support.v4.view.GravityCompat; import android.support.v4.view.ViewPager; import android.support.v4.widget.DrawerLayout; @@ -39,21 +37,18 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.Random; -import layout.fragmentThreadList; +import layout.FragmentBoardItemList; public class MainActivity extends AppCompatActivity - implements NavigationView.OnNavigationItemSelectedListener, fragmentThreadList.OnFragmentInteractionListener { - - public static final float CURRENT_VERSION = 1.5F; + implements NavigationView.OnNavigationItemSelectedListener, FragmentBoardItemList.OnFragmentInteractionListener { private ViewPager pager; // variable del ViewPager CustomFragmentPagerAdapter pagerAdapter; // Adaptador del ViewPager NavigationView navigationView; DrawerLayout drawer; FloatingActionButton fab; public ThemeManager themeManager; - fragmentThreadList childFragment; // Segunda página del ViewPager, se muestra un solo hilo (selecionado del catálogo) - fragmentThreadList mainFragment; // Primera página del ViewPager, se muestra una lista de hilos. (catálogo) -// fragmentThreadList recentFragment; + FragmentBoardItemList childFragment; // Segunda página del ViewPager, se muestra un solo hilo (selecionado del catálogo) + FragmentBoardItemList mainFragment; // Primera página del ViewPager, se muestra una lista de hilos. (catálogo) Toolbar toolbar = null; public int currentThemeId = 0, themeId = 0; // Id del recurso, Id del tema public ArrayList boardList = new ArrayList<>(); @@ -155,20 +150,17 @@ public class MainActivity extends AppCompatActivity navigationView.setNavigationItemSelectedListener(this); if (savedInstanceState != null) { - mainFragment = (fragmentThreadList) getSupportFragmentManager().getFragment(savedInstanceState, "mainFragment"); - childFragment = (fragmentThreadList) getSupportFragmentManager().getFragment(savedInstanceState, "childFragment"); -// recentFragment = (fragmentThreadList) getSupportFragmentManager().getFragment(savedInstanceState, "recentFragment"); + mainFragment = (FragmentBoardItemList) getSupportFragmentManager().getFragment(savedInstanceState, "mainFragment"); + childFragment = (FragmentBoardItemList) getSupportFragmentManager().getFragment(savedInstanceState, "childFragment"); } else { - mainFragment = fragmentThreadList.newInstance(true, null, null); - childFragment = fragmentThreadList.newInstance(false, null, null); -// recentFragment = fragmentThreadList.newInstance(false, null, -1); + mainFragment = FragmentBoardItemList.newInstance(true, null, null); + childFragment = FragmentBoardItemList.newInstance(false, null, null); } this.pager = (ViewPager) findViewById(R.id.pager); this.pagerAdapter = new CustomFragmentPagerAdapter(getSupportFragmentManager()); pagerAdapter.addFragment(mainFragment); pagerAdapter.addFragment(childFragment); -// pagerAdapter.addFragment(recentFragment); this.pager.setAdapter(pagerAdapter); pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java index 57aa362..85cd891 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java @@ -1,12 +1,8 @@ package org.bienvenidoainternet.baiparser; -import android.animation.ArgbEvaluator; -import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Color; import android.graphics.Paint; import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; @@ -28,6 +24,7 @@ import android.widget.ImageView; import android.widget.TextView; import org.bienvenidoainternet.baiparser.structure.BoardItem; +import org.bienvenidoainternet.baiparser.structure.BoardItemFile; import java.util.ArrayList; import java.util.Collections; @@ -36,7 +33,6 @@ import java.util.EnumSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.concurrent.TimeUnit; /** @@ -47,6 +43,8 @@ public class ThreadListAdapter extends ArrayAdapter{ private ThemeManager tm; Typeface monaFont; public boolean listThreads = false; + private ArrayList boardItems = new ArrayList(); + private static final String EXTRA_FILELIST = "fileList"; public ThreadListAdapter(Context context, List objects, ThemeManager tm) { super(context, 0, objects); @@ -55,6 +53,10 @@ public class ThreadListAdapter extends ArrayAdapter{ monaFont = Typeface.createFromAsset(context.getAssets(), "fonts/mona.ttf"); } + public void updateBoardItems(ArrayList boardItems){ + this.boardItems = boardItems; + } + private String intToHexString(int i){ return String.format("#%06X", (0xFFFFFF & i)); } @@ -73,7 +75,7 @@ public class ThreadListAdapter extends ArrayAdapter{ return result; } @Override - public View getView(int position, final View convertView, final ViewGroup parent){ + public View getView(final int position, final View convertView, final ViewGroup parent){ LayoutInflater inflater = (LayoutInflater)getContext() .getSystemService(Context.LAYOUT_INFLATER_SERVICE); View listItemView = convertView; @@ -120,7 +122,18 @@ public class ThreadListAdapter extends ArrayAdapter{ }else { Intent in = new Intent(convertView.getContext(), ViewerActivity.class); Bundle b = new Bundle(); - b.putParcelable("boardItem", boardItem); + ArrayList fileList = new ArrayList(); + int relativePosition = 0; + for (int i = 0; i < boardItems.size(); i++){ + if (!boardItems.get(i).getFile().isEmpty()){ + if (boardItems.get(i).getFile().equals(boardItem.getFile())){ + relativePosition = fileList.size(); + } + fileList.add(new BoardItemFile("http://bienvenidoainternet.org/" + boardItems.get(i).getParentBoard().getBoardDir() + "/src/" + boardItems.get(i).getFile(), boardItems.get(i).getFile(), boardItems.get(i).getParentBoard().getBoardDir())); + } + } + b.putParcelableArrayList(EXTRA_FILELIST, fileList); + b.putInt("position", relativePosition); in.putExtras(b); convertView.getContext().startActivity(in); } diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java index 4501c0f..9d140ec 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java @@ -2,55 +2,75 @@ package org.bienvenidoainternet.baiparser; import android.content.Context; import android.content.ContextWrapper; -import android.graphics.Bitmap; -import android.os.AsyncTask; +import android.media.MediaScannerConnection; +import android.net.Uri; import android.os.Bundle; import android.os.Environment; +import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.View; import android.widget.ProgressBar; import android.widget.Toast; -import com.davemorrissey.labs.subscaleview.ImageSource; import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; -import com.koushikdutta.async.future.FutureCallback; -import com.koushikdutta.ion.Ion; import org.bienvenidoainternet.baiparser.structure.BoardItem; +import org.bienvenidoainternet.baiparser.structure.BoardItemFile; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; +import java.util.ArrayList; -import pl.droidsonroids.gif.GifDrawable; +import layout.FragmentImage; import pl.droidsonroids.gif.GifImageView; -public class ViewerActivity extends AppCompatActivity { - private SubsamplingScaleImageView imageView; - private GifImageView gifView; - private BoardItem bi; - File imagePath; - +public class ViewerActivity extends AppCompatActivity implements FragmentImage.OnFragmentInteractionListener { + private static final String EXTRA_FILELIST = "fileList", EXTRA_RELATIVEPOSITION = "position"; + private ViewPager imagePager; + public ProgressBar barDownload; + private int relativePosition = 0; + public ArrayList fileList = new ArrayList(); + private CustomFragmentPagerAdapter pagerAdapter; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (savedInstanceState != null){ - bi = savedInstanceState.getParcelable("boardItem"); - } if (getIntent().getExtras() != null){ - bi = getIntent().getParcelableExtra("boardItem"); + fileList = getIntent().getParcelableArrayListExtra(EXTRA_FILELIST); + relativePosition = getIntent().getIntExtra(EXTRA_RELATIVEPOSITION, 0); } setContentView(R.layout.activity_viewer); - imageView = (SubsamplingScaleImageView)findViewById(R.id.imageView); - gifView = (GifImageView) findViewById(R.id.gifView); - setTitle(bi.getFile()); - downloadFile(); + barDownload = (ProgressBar) findViewById(R.id.downloadProgressBar); + imagePager = (ViewPager) findViewById(R.id.imagePager); + this.pagerAdapter = new CustomFragmentPagerAdapter(getSupportFragmentManager()); + for (int i = 0; i < fileList.size(); i++){ + Log.v("ImageViewer", fileList.get(i).toString()); + pagerAdapter.addFragment(FragmentImage.newInstance(fileList.get(i))); + } + imagePager.setAdapter(pagerAdapter); + imagePager.setCurrentItem(relativePosition); + imagePager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @Override + public void onPageSelected(int position) { + getSupportActionBar().setSubtitle(fileList.get(position).file); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); this.getSupportActionBar().setDisplayHomeAsUpEnabled(true); } @@ -61,9 +81,13 @@ public class ViewerActivity extends AppCompatActivity { baiDir.mkdir(); } if (item.getItemId() == R.id.menu_save_img){ - File to = new File(Environment.getExternalStorageDirectory().getPath() + "/Bai/" + bi.getFile()); + BoardItemFile boardItemFile = fileList.get(imagePager.getCurrentItem()); + File to = new File(Environment.getExternalStorageDirectory().getPath() + "/Bai/" + boardItemFile.file); + ContextWrapper cw = new ContextWrapper(getApplicationContext()); + File directory = cw.getDir("src", Context.MODE_PRIVATE); + File fileSource = new File(directory, boardItemFile.boardDir + "_" + boardItemFile.file); try{ - InputStream in = new FileInputStream(imagePath); + InputStream in = new FileInputStream(fileSource); OutputStream out = new FileOutputStream(to); byte[] buf = new byte[1024]; int len; @@ -72,7 +96,8 @@ public class ViewerActivity extends AppCompatActivity { } in.close(); out.close(); - Toast.makeText(getApplicationContext(), bi.getFile() + " guardado.", Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), boardItemFile.file + " guardado.", Toast.LENGTH_LONG).show(); + MediaScannerConnection.scanFile(this, new String[]{to.getPath()}, new String[]{"image/jpeg"}, null); }catch (Exception e){ e.printStackTrace(); } @@ -91,135 +116,8 @@ public class ViewerActivity extends AppCompatActivity { return true; } - private void downloadFile(){ - ContextWrapper cw = new ContextWrapper(getApplicationContext()); - File directory = cw.getDir("src", Context.MODE_PRIVATE); - final File filePath = new File(directory, bi.getParentBoard().getBoardDir() + "_" + bi.getFile()); - final ProgressBar downloadBar = (ProgressBar) findViewById(R.id.downloadProgressBar); - if (filePath.exists()){ - downloadBar.setVisibility(View.GONE); - if (bi.getFile().endsWith(".gif")){ - try { - GifDrawable gifFromFile = new GifDrawable(filePath); - gifView.setImageDrawable(gifFromFile); - imageView.setVisibility(View.GONE); - }catch(Exception e){ - e.printStackTrace(); - } - }else{ - imageView.setImage(ImageSource.uri(filePath.toURI().getPath())); - gifView.setVisibility(View.GONE); - } - } - Ion.with(getApplicationContext()) - .load("http://bienvenidoainternet.org/" + bi.getParentBoard().getBoardDir() + "/src/" + bi.getFile()) - .progressBar(downloadBar) - .asInputStream() - .setCallback(new FutureCallback() { - @Override - public void onCompleted(Exception e, InputStream result) { - downloadBar.setVisibility(View.GONE); - if (e != null){ - e.printStackTrace(); - }else{ - FileOutputStream fout; - try { - fout = new FileOutputStream(filePath); - final byte data[] = new byte[1024]; - int count; - while ((count = result.read(data, 0, 1024)) != -1) { - fout.write(data, 0, count); - } - }catch(Exception e1) { - e1.printStackTrace(); - } - if (bi.getFile().endsWith(".gif")){ - try { - GifDrawable gifFromFile = new GifDrawable(filePath); - gifView.setImageDrawable(gifFromFile); - imageView.setVisibility(View.GONE); - }catch(Exception e2){ - e2.printStackTrace(); - } - }else{ - imageView.setImage(ImageSource.uri(filePath.toURI().getPath())); - gifView.setVisibility(View.GONE); - } - } - } - }); - } - - class TaskDownloadFile extends AsyncTask { - - @Override - protected File doInBackground(Void... params) { - Bitmap downloadedBitmap = null; - ContextWrapper cw = new ContextWrapper(getApplicationContext()); - File directory = cw.getDir("src", Context.MODE_PRIVATE); - File mypath = new File(directory, bi.getParentBoard().getBoardDir() + "_" + bi.getFile()); - if (mypath.exists()){ - System.out.println("[Viewer] resource exist!"); - return mypath; - } - try { - String sUrl = "http://bienvenidoainternet.org/" + bi.getParentBoard().getBoardDir() + "/src/" + bi.getFile(); - System.out.println("[Viewer]dwonloading " + sUrl); -// System.out.println(sUrl); - InputStream in = new java.net.URL(sUrl).openStream(); -// downloadedBitmap = BitmapFactory.decodeStream(in); - -// if (downloadedBitmap != null){ - FileOutputStream fout = null; - try { -// in = new BufferedInputStream(new URL(urlString).openStream()); - fout = new FileOutputStream(mypath); - - final byte data[] = new byte[1024]; - int count; - while ((count = in.read(data, 0, 1024)) != -1) { - fout.write(data, 0, count); - } - - - }catch(Exception e){ - e.printStackTrace(); - }finally { - if (in != null) { - in.close(); - } - if (fout != null) { - fout.close(); - } - } -// } - } catch (Exception e) { - e.printStackTrace(); - } - - return mypath; - } - - @Override - protected void onPostExecute(File file) { - super.onPostExecute(file); - imagePath = file; -// iv.setImageBitmap(bitmap); - if (bi.getFile().endsWith(".gif")){ - try { - GifDrawable gifFromFile = new GifDrawable(file); - gifView.setImageDrawable(gifFromFile); - imageView.setVisibility(View.GONE); - }catch(Exception e){ - e.printStackTrace(); - } - }else{ - imageView.setImage(ImageSource.uri(file.toURI().getPath())); - gifView.setVisibility(View.GONE); -// imageView.setImage(ImageSource.resource(R.drawable.bai)); -// System.out.println("not a gif file: " + file.toURI().getPath()); - } + @Override + public void onFragmentInteraction(Uri uri) { - } } } diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/structure/BoardItemFile.java b/app/src/main/java/org/bienvenidoainternet/baiparser/structure/BoardItemFile.java new file mode 100644 index 0000000..eeff1c4 --- /dev/null +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/structure/BoardItemFile.java @@ -0,0 +1,49 @@ +package org.bienvenidoainternet.baiparser.structure; + +import android.os.Parcel; +import android.os.Parcelable; + +/** + * Created by Renard on 08-04-2016. + */ +public class BoardItemFile implements Parcelable{ + public String file; + public String fileURL; + public String boardDir; + + public BoardItemFile(String fileURL, String file, String boardDir){ + this.fileURL = fileURL; + this.file = file; + this.boardDir = boardDir; + } + + protected BoardItemFile(Parcel in) { + file = in.readString(); + fileURL = in.readString(); + boardDir = in.readString(); + } + + public static final Creator CREATOR = new Creator() { + @Override + public BoardItemFile createFromParcel(Parcel in) { + return new BoardItemFile(in); + } + + @Override + public BoardItemFile[] newArray(int size) { + return new BoardItemFile[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(file); + dest.writeString(fileURL); + dest.writeString(boardDir); + } +} diff --git a/app/src/main/res/layout/activity_viewer.xml b/app/src/main/res/layout/activity_viewer.xml index b66e66b..7febe39 100644 --- a/app/src/main/res/layout/activity_viewer.xml +++ b/app/src/main/res/layout/activity_viewer.xml @@ -4,21 +4,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context="org.bienvenidoainternet.baiparser.ViewerActivity"> - - - - + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + diff --git a/app/src/main/res/layout/fragment_fragment_image.xml b/app/src/main/res/layout/fragment_fragment_image.xml new file mode 100644 index 0000000..093508a --- /dev/null +++ b/app/src/main/res/layout/fragment_fragment_image.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7fa3e34..f5be573 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -73,4 +73,7 @@ Opciones + + Hello blank fragment + -- cgit v1.2.1-18-gbd029 From f90f14e5de8effc68a40029066754de1954cb65d Mon Sep 17 00:00:00 2001 From: Renard Date: Fri, 8 Apr 2016 20:31:43 -0300 Subject: LICENSE --- LICENSE.md | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE.txt | 674 ------------------------------------------------------------ 2 files changed, 674 insertions(+), 674 deletions(-) create mode 100644 LICENSE.md delete mode 100644 LICENSE.txt diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 94a9ed0..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. -- cgit v1.2.1-18-gbd029 From 90ee611af8ba4c38e70f27eb0df55e9134ad625c Mon Sep 17 00:00:00 2001 From: Renard Date: Mon, 11 Apr 2016 17:50:06 -0300 Subject: New ViewActivity, ThemeManager --- .../main/java/layout/FragmentBoardItemList.java | 10 ++- app/src/main/java/layout/FragmentImage.java | 18 ++++- .../baiparser/LicensesActivity.java | 5 +- .../baiparser/MainActivity.java | 48 ++++------- .../baiparser/ResponseActivity.java | 6 +- .../baiparser/SettingsActivity.java | 2 + .../baiparser/ThemeManager.java | 92 +++++++++++++++++++--- .../baiparser/ThreadListAdapter.java | 9 ++- .../baiparser/ViewerActivity.java | 8 +- app/src/main/res/layout/activity_response.xml | 1 - .../main/res/layout/fragment_fragment_image.xml | 33 +++++++- .../res/layout/fragment_fragment_thread_list.xml | 1 - app/src/main/res/menu/menu_viewer.xml | 3 +- app/src/main/res/values/colors.xml | 4 +- app/src/main/res/values/drawables.xml | 2 +- app/src/main/res/values/styles.xml | 14 +++- 16 files changed, 183 insertions(+), 73 deletions(-) diff --git a/app/src/main/java/layout/FragmentBoardItemList.java b/app/src/main/java/layout/FragmentBoardItemList.java index 38e4819..149def3 100644 --- a/app/src/main/java/layout/FragmentBoardItemList.java +++ b/app/src/main/java/layout/FragmentBoardItemList.java @@ -38,6 +38,7 @@ import org.bienvenidoainternet.baiparser.MainActivity; import org.bienvenidoainternet.baiparser.R; import org.bienvenidoainternet.baiparser.RecentPostAdapter; import org.bienvenidoainternet.baiparser.ResponseActivity; +import org.bienvenidoainternet.baiparser.ThemeManager; import org.bienvenidoainternet.baiparser.ThreadListAdapter; import org.bienvenidoainternet.baiparser.structure.Board; import org.bienvenidoainternet.baiparser.structure.BoardItem; @@ -80,6 +81,8 @@ public class FragmentBoardItemList extends Fragment { LinearLayout layoutThreadProcess; TextView txtThreadProcess; + ThemeManager tm; + public FragmentBoardItemList() { // Required empty public constructor @@ -104,6 +107,7 @@ public class FragmentBoardItemList extends Fragment { this.currentThread = getArguments().getParcelable(ARG_CURRENT_THREAD); this.imMainFragment = getArguments().getBoolean(ARG_MAIN_FRAGMENT); } + tm = new ThemeManager(getActivity()); } @Override @@ -130,7 +134,7 @@ public class FragmentBoardItemList extends Fragment { // Aplicación del Tema settings = PreferenceManager.getDefaultSharedPreferences(this.getContext()); - int themeResId = ((MainActivity)getActivity()).getCurrentThemeId(); + int themeResId = tm.getCurrentThemeId(); Context context = new ContextThemeWrapper(getActivity(), themeResId); LayoutInflater localInflater = inflater.cloneInContext(context); View v = localInflater.inflate(R.layout.fragment_fragment_thread_list, container, false); @@ -145,14 +149,14 @@ public class FragmentBoardItemList extends Fragment { this.loadingBar = (ProgressBar)rootView.findViewById(R.id.progressBar); // Agregamos color al divider del listview - ColorDrawable cd = new ColorDrawable((((MainActivity) getActivity()).themeManager).getMarginColor()); + ColorDrawable cd = new ColorDrawable(tm.getMarginColor()); listViewBoardItems.setDivider(cd); listViewBoardItems.setDividerHeight(1); // registramos los menus del listview registerForContextMenu(listViewBoardItems); // Creamos los dos adaptadores y los seteamos dependiendo del modo del fragmento - listViewAdapter = new ThreadListAdapter(v.getContext(), boardItems, (((MainActivity) getActivity()).themeManager)); + listViewAdapter = new ThreadListAdapter(v.getContext(), boardItems, tm); recentPostAdapter = new RecentPostAdapter(v.getContext(), boardItems); if (recentPostMode){ listViewBoardItems.setAdapter(recentPostAdapter); diff --git a/app/src/main/java/layout/FragmentImage.java b/app/src/main/java/layout/FragmentImage.java index 399e9f3..f337e5f 100644 --- a/app/src/main/java/layout/FragmentImage.java +++ b/app/src/main/java/layout/FragmentImage.java @@ -2,6 +2,7 @@ package layout; import android.content.Context; import android.content.ContextWrapper; +import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -9,8 +10,9 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.ProgressBar; -import android.widget.TextView; +import android.widget.RelativeLayout; import com.davemorrissey.labs.subscaleview.ImageSource; import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; @@ -19,7 +21,6 @@ import com.koushikdutta.ion.Ion; import org.bienvenidoainternet.baiparser.R; import org.bienvenidoainternet.baiparser.ViewerActivity; -import org.bienvenidoainternet.baiparser.structure.BoardItem; import org.bienvenidoainternet.baiparser.structure.BoardItemFile; import java.io.File; @@ -80,11 +81,24 @@ public class FragmentImage extends Fragment { gifView = (GifImageView) view.findViewById(R.id.gifView); imageView.setVisibility(View.GONE); gifView.setVisibility(View.GONE); + RelativeLayout layoutOpenBrowser = (RelativeLayout) view.findViewById(R.id.layoutOpenBrowser); if (boardItemFile.file != null) { if (!boardItemFile.file.endsWith(".webm") && !boardItemFile.file.endsWith(".swf")) { + layoutOpenBrowser.setVisibility(View.GONE); downloadFile(); + }else{ + layoutOpenBrowser.setVisibility(View.VISIBLE); } } + Button btnOpenBrowser = (Button) view.findViewById(R.id.btnLaunchBrowser); + btnOpenBrowser.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent in = new Intent(Intent.ACTION_VIEW, Uri.parse(boardItemFile.fileURL)); + in.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + v.getContext().startActivity(in); + } + }); return view; } diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/LicensesActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/LicensesActivity.java index b91ce2b..575754a 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/LicensesActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/LicensesActivity.java @@ -1,7 +1,7 @@ package org.bienvenidoainternet.baiparser; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.webkit.WebView; public class LicensesActivity extends AppCompatActivity { @@ -9,7 +9,10 @@ public class LicensesActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ThemeManager tm = new ThemeManager(this); + this.setTheme(tm.getThemeForActivity()); setContentView(R.layout.activity_licenses); + getSupportActionBar().setTitle("Acerca de BaI App"); WebView webView = (WebView) findViewById(R.id.webView); webView.loadUrl("file:///android_asset/html/licenses.html"); } diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java index 9130160..18d2e08 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java @@ -31,6 +31,7 @@ import com.koushikdutta.ion.Ion; import org.bienvenidoainternet.baiparser.structure.Board; import org.bienvenidoainternet.baiparser.structure.BoardItem; +import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -78,46 +79,25 @@ public class MainActivity extends AppCompatActivity @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ThemeManager tm = new ThemeManager(this); + this.setTheme(tm.getThemeForMainActivity()); if (savedInstanceState != null) { currentThemeId = savedInstanceState.getInt("currentThemeId"); boardList = savedInstanceState.getParcelableArrayList("boardList"); } SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); - themeId = Integer.valueOf(settings.getString("pref_theme", "1")); - if (settings.getString("pref_password", "").isEmpty()){ SharedPreferences.Editor edit = settings.edit(); edit.putString("pref_password", makePassword()); edit.commit(); } - switch (themeId) { - case 1: - currentThemeId = R.style.AppTheme_NoActionBar; - break; - case 2: - currentThemeId = R.style.AppTheme_Dark; - break; - case 3: - currentThemeId = R.style.AppTheme_HeadLine; - setTheme(R.style.AppTheme_HeadLine_Activity); - break; - case 4: - currentThemeId = R.style.AppTheme_Black; - setTheme(R.style.AppTheme_Black_Activity); - break; - } - - themeManager = new ThemeManager(this); - Log.d("ThemeManager", "isDarkTheme: " + themeManager.isDarkTheme()); - setContentView(R.layout.activity_main); toolbar = (Toolbar) findViewById(R.id.toolbar); toolbar.setTitle("Bievenido a internet"); this.setSupportActionBar(toolbar); - fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override @@ -372,25 +352,25 @@ public class MainActivity extends AppCompatActivity final SubMenu sub = menu.addSubMenu("Lista de Boards"); Ion.with(getApplicationContext()) .load("http://bienvenidoainternet.org/cgi/api/boards") - .asJsonObject() - .setCallback(new FutureCallback() { + .asString() + .setCallback(new FutureCallback() { @Override - public void onCompleted(Exception e, JsonObject result) { + public void onCompleted(Exception e, String result) { if (e != null) { e.printStackTrace(); Toast.makeText(getApplicationContext(), e.getMessage(), Toast.LENGTH_LONG).show(); - } else { - JsonArray boards = result.get("boards").getAsJsonArray(); - for (int i = 0; i < boards.size(); i++) { - try { - JSONObject board = new JSONObject(boards.get(i).toString()); + }else { + try { + JSONArray boards = new JSONObject(result).getJSONArray("boards"); + for (int i = 0; i < boards.length(); i++) { + JSONObject board = boards.getJSONObject(i); Board parsedBoard = new Board(board.getString("name"), board.getString("dir"), board.getInt("board_type")); sub.add(parsedBoard.getBoardName()); boardList.add(parsedBoard); - } catch (JSONException e1) { - e1.printStackTrace(); - Toast.makeText(getApplicationContext(), "Error parsing JSON", Toast.LENGTH_LONG).show(); } + }catch (JSONException e1) { + Toast.makeText(getApplicationContext(), e1.getMessage(), Toast.LENGTH_LONG).show(); + e1.printStackTrace(); } } } diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ResponseActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ResponseActivity.java index e96868a..350de99 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ResponseActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ResponseActivity.java @@ -2,12 +2,10 @@ package org.bienvenidoainternet.baiparser; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -45,10 +43,12 @@ public class ResponseActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ThemeManager tm = new ThemeManager(this); + this.setTheme(tm.getThemeForActivity()); setContentView(R.layout.activity_response); + getSupportActionBar().setTitle("Respondiendo"); settings = PreferenceManager.getDefaultSharedPreferences(this); password = settings.getString("pref_password", "12345678"); - Log.v("password", password); if (savedInstanceState != null){ this.theReply = savedInstanceState.getParcelable("theReply"); diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/SettingsActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/SettingsActivity.java index e8e7df4..eefc5fb 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/SettingsActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/SettingsActivity.java @@ -95,6 +95,8 @@ public class SettingsActivity extends AppCompatPreferenceActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ThemeManager tm = new ThemeManager(this); + this.setTheme(tm.getThemeForActivity()); setupActionBar(); getFragmentManager().beginTransaction().replace(android.R.id.content, new GeneralPreferenceFragment()).commit(); } diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ThemeManager.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ThemeManager.java index 7f0be86..28c0d74 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ThemeManager.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ThemeManager.java @@ -1,26 +1,54 @@ package org.bienvenidoainternet.baiparser; +import android.app.Activity; +import android.content.SharedPreferences; import android.content.res.TypedArray; import android.graphics.Color; +import android.preference.PreferenceManager; +import android.util.Log; /** * Created by Renard on 16-03-2016. */ public class ThemeManager { - private MainActivity ac; private int currentThemeId; - public ThemeManager(MainActivity ac){ - this.ac = ac; - this.currentThemeId = ac.getCurrentThemeId(); + private int prefThemeId; + private Activity activity; + public ThemeManager(Activity activity){ + this.activity = activity; + setCurrentThemeId(); + } + + public void setCurrentThemeId(){ + SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity); + int themeId = Integer.valueOf(settings.getString("pref_theme", "1")); + prefThemeId = themeId; + switch (themeId) { + case 1: + currentThemeId = R.style.AppTheme_NoActionBar; + break; + case 2: + currentThemeId = R.style.AppTheme_Dark; + break; + case 3: + currentThemeId = R.style.AppTheme_HeadLine; +// setTheme(R.style.AppTheme_HeadLine_Activity); + break; + case 4: + currentThemeId = R.style.AppTheme_Black; +// setTheme(R.style.AppTheme_Black_Activity); + break; + } + Log.d("ThemeManager", "isDarkTheme: " + isDarkTheme()); } public int getSageColor(){ - TypedArray a = ac.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.sageColor}); + TypedArray a = activity.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.sageColor}); return a.getColor(0, Color.CYAN); } public int getMarginColor(){ - TypedArray a = ac.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.marginColor}); + TypedArray a = activity.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.marginColor}); return a.getColor(0, Color.CYAN); } @@ -29,27 +57,69 @@ public class ThemeManager { } public int getNameColor() { - TypedArray a = ac.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.nameColor}); + TypedArray a = activity.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.nameColor}); return a.getColor(0, Color.CYAN); } public int getTripcodeColor() { - TypedArray a = ac.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.tripcodeColor}); + TypedArray a = activity.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.tripcodeColor}); return a.getColor(0, Color.CYAN); } public int getPrimaryColor(){ - TypedArray a = ac.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.colorPrimary}); + TypedArray a = activity.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.colorPrimary}); return a.getColor(0, Color.CYAN); } public int getPrimaryDarkColor(){ - TypedArray a = ac.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.colorPrimaryDark}); + TypedArray a = activity.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.colorPrimaryDark}); return a.getColor(0, Color.CYAN); } public boolean isDarkTheme(){ - TypedArray a = ac.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.isDarkTheme}); + TypedArray a = activity.getTheme().obtainStyledAttributes(currentThemeId, new int[]{R.attr.isDarkTheme}); return a.getBoolean(0, false); } + public int getThemeForActivity(){ + int id = R.style.AppTheme; + switch (prefThemeId) { + case 1: // pseudoch + id = R.style.AppTheme; + break; + case 2: // nightmode + id = R.style.AppTheme; + break; + case 3: // photon + id = R.style.AppTheme_HeadLineActionBar; + break; + case 4: // tomorrow + id = R.style.AppTheme_BlackActionBar; + break; + } + return id; + } + + public int getThemeForMainActivity(){ + int id = R.style.AppTheme_NoActionBar; + switch (prefThemeId) { + case 1: // pseudoch + id = R.style.AppTheme_NoActionBar; + break; + case 2: // nightmode + id = R.style.AppTheme_NoActionBar; + break; + case 3: // photon + id = R.style.AppTheme_HeadLineActionBar_NoActionBar; + break; + case 4: // tomorrow + id = R.style.AppTheme_BlackActionBar_NoActionBar; + break; + } + return id; + } + + + public int getCurrentThemeId() { + return currentThemeId; + } } diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java index 85cd891..7a85c1f 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ThreadListAdapter.java @@ -228,8 +228,15 @@ public class ThreadListAdapter extends ArrayAdapter{ txtReplies.setVisibility(boardItem.isReply ? View.GONE : View.VISIBLE); txtReplies.setText(boardItem.getTotalReplies() + " respuestas " + (boardItem.getTotalFiles() == 0 ? "" : ", " + boardItem.getTotalFiles() + " archivos")); + String fileExt = ""; + if (!boardItem.getFile().isEmpty()){ + String[] pathSplit = boardItem.getFile().split("\\."); + if (pathSplit.length != 0){ + fileExt = pathSplit[1].toUpperCase(); + } + } txtFileInfo.setVisibility(boardItem.getThumb().isEmpty() ? View.GONE : View.VISIBLE); - txtFileInfo.setText((boardItem.getFileSize() / 1024) + " KB " + boardItem.getThumbHeight() + "x" + boardItem.getThumbWidth()); + txtFileInfo.setText(fileExt + " " + (boardItem.getFileSize() / 1024) + " KB " + boardItem.getThumbHeight() + "x" + boardItem.getThumbWidth()); // Trasnparentar items con sage if (convertView != null){ diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java index 9d140ec..8dc1262 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java @@ -14,9 +14,6 @@ import android.view.MenuItem; import android.widget.ProgressBar; import android.widget.Toast; -import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; - -import org.bienvenidoainternet.baiparser.structure.BoardItem; import org.bienvenidoainternet.baiparser.structure.BoardItemFile; import java.io.File; @@ -27,7 +24,6 @@ import java.io.OutputStream; import java.util.ArrayList; import layout.FragmentImage; -import pl.droidsonroids.gif.GifImageView; public class ViewerActivity extends AppCompatActivity implements FragmentImage.OnFragmentInteractionListener { private static final String EXTRA_FILELIST = "fileList", EXTRA_RELATIVEPOSITION = "position"; @@ -54,7 +50,6 @@ public class ViewerActivity extends AppCompatActivity implements FragmentImage.O pagerAdapter.addFragment(FragmentImage.newInstance(fileList.get(i))); } imagePager.setAdapter(pagerAdapter); - imagePager.setCurrentItem(relativePosition); imagePager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { @@ -63,7 +58,7 @@ public class ViewerActivity extends AppCompatActivity implements FragmentImage.O @Override public void onPageSelected(int position) { - getSupportActionBar().setSubtitle(fileList.get(position).file); + getSupportActionBar().setSubtitle("(" + (position + 1) + " / " + fileList.size() + ") " + fileList.get(position).file); } @Override @@ -71,6 +66,7 @@ public class ViewerActivity extends AppCompatActivity implements FragmentImage.O } }); + imagePager.setCurrentItem(relativePosition); this.getSupportActionBar().setDisplayHomeAsUpEnabled(true); } diff --git a/app/src/main/res/layout/activity_response.xml b/app/src/main/res/layout/activity_response.xml index bfd143e..15d35eb 100644 --- a/app/src/main/res/layout/activity_response.xml +++ b/app/src/main/res/layout/activity_response.xml @@ -1,7 +1,6 @@ + tools:context="layout.FragmentImage" + android:orientation="vertical"> + + + + + +