From b36548c7dd0075826a0a7ff2e42510358457e1f4 Mon Sep 17 00:00:00 2001 From: Floens Date: Sat, 30 May 2015 15:48:00 +0200 Subject: [PATCH] Some style fixes --- .../src/main/java/org/floens/chan/Chan.java | 3 +- .../org/floens/chan/ui/toolbar/Toolbar.java | 2 +- .../ui/view/TouchBlockingFrameLayout.java | 43 +++++++++++++ .../layout/controller_navigation_drawer.xml | 2 +- .../controller_navigation_image_viewer.xml | 2 +- Clover/app/src/main/res/values/attrs.xml | 60 ------------------- Clover/app/src/main/res/values/dimens.xml | 4 ++ Clover/app/src/main/res/values/styles.xml | 23 ++++--- 8 files changed, 62 insertions(+), 77 deletions(-) create mode 100644 Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingFrameLayout.java create mode 100644 Clover/app/src/main/res/values/dimens.xml diff --git a/Clover/app/src/main/java/org/floens/chan/Chan.java b/Clover/app/src/main/java/org/floens/chan/Chan.java index 176fff30..2538464b 100644 --- a/Clover/app/src/main/java/org/floens/chan/Chan.java +++ b/Clover/app/src/main/java/org/floens/chan/Chan.java @@ -26,7 +26,6 @@ import android.view.ViewConfiguration; import com.android.volley.RequestQueue; import com.android.volley.toolbox.ImageLoader; import com.android.volley.toolbox.Volley; -import com.squareup.leakcanary.LeakCanary; import com.squareup.leakcanary.RefWatcher; import org.floens.chan.chan.ChanUrls; @@ -127,7 +126,7 @@ public class Chan extends Application { } if (ChanBuild.DEVELOPER_MODE) { - refWatcher = LeakCanary.install(this); +// refWatcher = LeakCanary.install(this); StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build()); StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll().penaltyLog().build()); } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java index c606e906..33497ef3 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java @@ -152,7 +152,7 @@ public class Toolbar extends LinearLayout implements View.OnClickListener, LoadV setRoundItemBackground(arrowMenuView); - leftButtonContainer.addView(arrowMenuView, new FrameLayout.LayoutParams(dp(56), FrameLayout.LayoutParams.MATCH_PARENT, Gravity.CENTER_VERTICAL)); + leftButtonContainer.addView(arrowMenuView, new FrameLayout.LayoutParams(getResources().getDimensionPixelSize(R.dimen.toolbar_height), FrameLayout.LayoutParams.MATCH_PARENT, Gravity.CENTER_VERTICAL)); navigationItemContainer = new LoadView(getContext()); navigationItemContainer.setListener(this); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingFrameLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingFrameLayout.java new file mode 100644 index 00000000..5f08bacb --- /dev/null +++ b/Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingFrameLayout.java @@ -0,0 +1,43 @@ +/* + * Clover - 4chan browser https://github.com/Floens/Clover/ + * Copyright (C) 2014 Floens + * + * 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 . + */ +package org.floens.chan.ui.view; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.widget.FrameLayout; + +public class TouchBlockingFrameLayout extends FrameLayout { + public TouchBlockingFrameLayout(Context context) { + super(context); + } + + public TouchBlockingFrameLayout(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public TouchBlockingFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + @Override + public boolean onTouchEvent(@NonNull MotionEvent event) { + return true; + } +} diff --git a/Clover/app/src/main/res/layout/controller_navigation_drawer.xml b/Clover/app/src/main/res/layout/controller_navigation_drawer.xml index fc9ce774..6cf48fdf 100644 --- a/Clover/app/src/main/res/layout/controller_navigation_drawer.xml +++ b/Clover/app/src/main/res/layout/controller_navigation_drawer.xml @@ -31,7 +31,7 @@ along with this program. If not, see . diff --git a/Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml b/Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml index 469042d6..1bbecc77 100644 --- a/Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml +++ b/Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml @@ -25,7 +25,7 @@ along with this program. If not, see . diff --git a/Clover/app/src/main/res/values/attrs.xml b/Clover/app/src/main/res/values/attrs.xml index 35c180a1..d2997f77 100644 --- a/Clover/app/src/main/res/values/attrs.xml +++ b/Clover/app/src/main/res/values/attrs.xml @@ -16,66 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Clover/app/src/main/res/values/dimens.xml b/Clover/app/src/main/res/values/dimens.xml new file mode 100644 index 00000000..c9fb5a44 --- /dev/null +++ b/Clover/app/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 56dp + diff --git a/Clover/app/src/main/res/values/styles.xml b/Clover/app/src/main/res/values/styles.xml index 9c662107..d2d3bfc7 100644 --- a/Clover/app/src/main/res/values/styles.xml +++ b/Clover/app/src/main/res/values/styles.xml @@ -18,12 +18,13 @@ along with this program. If not, see . #ff4caf50 #ff388e3c + #ff009688