Moar new assets. Remove old assets

ba9301f1 · Jawn · e22abe93 · ba9301f1 · e22abe93 · e22abe93
Commit ba9301f1 authored 9 years ago by Jawn
--- a/app/src/main/java/com/commit451/gitlab/FileActivity.java
+++ b/app/src/main/java/com/commit451/gitlab/FileActivity.java
@@ -6,7 +6,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.support.v7.widget.Toolbar;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.webkit.MimeTypeMap;
@@ -90,21 +89,6 @@ public class FileActivity extends BaseActivity {
 		fileBlobView.getSettings().setJavaScriptEnabled(true);
 	}
 	
-	private void enableMenu(Menu menu) {
-		MenuItem openFile = menu.getItem(0);
-		MenuItem saveFile = menu.getItem(1);
-
-		if(openFile != null) {
-			openFile.setEnabled(true);
-			openFile.setIcon(R.drawable.ic_action_open);
-		}
-		
-		if(saveFile != null) {
-			saveFile.setEnabled(true);
-			saveFile.setIcon(R.drawable.ic_action_save);
-		}
-	}
-	
 	private Callback<Response> blobCallback = new Callback<Response>() {
 		
 		@Override
@@ -124,8 +108,8 @@ public class FileActivity extends BaseActivity {
 			
 			String temp = "<!DOCTYPE html><html><head><link href=\"github.css\" rel=\"stylesheet\" /></head><body><pre><code>" + StringEscapeUtils.escapeHtml(content) + "</code></pre><script src=\"highlight.pack.js\"></script><script>hljs.initHighlightingOnLoad();</script></body></html>";
 			fileBlobView.loadDataWithBaseURL("file:///android_asset/", temp, "text/html", "utf8", null);
-			
-			enableMenu(toolbar.getMenu());
+
+			toolbar.inflateMenu(R.menu.file);
 		}
 		
 		@Override

--- a/app/src/main/java/com/commit451/gitlab/views/FilterEditText.java
+++ b/app/src/main/java/com/commit451/gitlab/views/FilterEditText.java
-package com.commit451.gitlab.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewGroup;
-import android.widget.EditText;
-
-import com.commit451.gitlab.R;
-
-public class FilterEditText extends EditText {
-
-    private DrawableClickListener clickListener;
-
-    public FilterEditText (Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public FilterEditText(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
-        super.onTextChanged(text, start, lengthBefore, lengthAfter);
-
-        if(text.length() > 0)
-            super.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_input_delete, 0);
-        else
-            super.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if(event.getAction() == MotionEvent.ACTION_DOWN) {
-            if(getText().length() > 0 && this.getCompoundDrawables()[2] != null) {
-                int actionX = (int) event.getRawX();
-                int drawableX = getRight();
-
-                drawableX -= getCompoundDrawables()[2].getBounds().width();
-                drawableX -= ((ViewGroup.MarginLayoutParams) getLayoutParams()).rightMargin;
-                drawableX -= 15;
-
-                if(actionX >= drawableX && clickListener != null) {
-                    playSoundEffect(android.view.SoundEffectConstants.CLICK);
-                    clickListener.onClick(DrawableClickListener.DrawablePosition.RIGHT);
-                    event.setAction(MotionEvent.ACTION_CANCEL);
-
-                    return false;
-                }
-
-                return super.onTouchEvent(event);
-            }
-
-        }
-        return super.onTouchEvent(event);
-    }
-
-    public void setDrawableClickListener(DrawableClickListener listener) {
-        this.clickListener = listener;
-    }
-}
--- a/app/src/main/res/drawable-hdpi/ic_action_add.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_add.png
--- a/app/src/main/res/drawable-hdpi/ic_action_copy.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_copy.png
--- a/app/src/main/res/drawable-hdpi/ic_action_open.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_open.png
--- a/app/src/main/res/drawable-hdpi/ic_action_open_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_open_dark.png
--- a/app/src/main/res/drawable-hdpi/ic_action_save.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_save.png
--- a/app/src/main/res/drawable-hdpi/ic_action_save_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_save_dark.png
--- a/app/src/main/res/drawable-hdpi/ic_action_send.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_send.png
--- a/app/src/main/res/drawable-hdpi/ic_copy.png
+++ b/app/src/main/res/drawable-hdpi/ic_copy.png
--- a/app/src/main/res/drawable-hdpi/ic_edit.png
+++ b/app/src/main/res/drawable-hdpi/ic_edit.png
--- a/app/src/main/res/drawable-hdpi/ic_input_delete.png
+++ b/app/src/main/res/drawable-hdpi/ic_input_delete.png
--- a/app/src/main/res/drawable-hdpi/ic_save.png
+++ b/app/src/main/res/drawable-hdpi/ic_save.png
--- a/app/src/main/res/drawable-hdpi/ic_send.png
+++ b/app/src/main/res/drawable-hdpi/ic_send.png
--- a/app/src/main/res/drawable-hdpi/ic_thanks.png
+++ b/app/src/main/res/drawable-hdpi/ic_thanks.png
--- a/app/src/main/res/drawable-mdpi/ic_action_add.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_add.png
--- a/app/src/main/res/drawable-mdpi/ic_action_copy.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_copy.png
--- a/app/src/main/res/drawable-mdpi/ic_action_open.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_open.png
--- a/app/src/main/res/drawable-mdpi/ic_action_open_dark.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_open_dark.png
--- a/app/src/main/res/drawable-mdpi/ic_action_save.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_save.png