From f84bba5d79a21819e805a122ccce67b88c7e5a8e Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 30 Jun 2016 12:03:12 -0300 Subject: [PATCH] Remove unused Java layout helpers Closes #397 --- .../android/util/CommonLayoutParams.java | 29 ------------------- .../android/util/ElasticHorizontalSpace.java | 14 --------- .../android/util/HorizontalBorder.java | 18 ------------ .../android/util/LayoutUtils.java | 23 --------------- .../android/util/ListLoadingProgressBar.java | 21 -------------- 5 files changed, 105 deletions(-) delete mode 100644 briar-android/src/org/briarproject/android/util/CommonLayoutParams.java delete mode 100644 briar-android/src/org/briarproject/android/util/ElasticHorizontalSpace.java delete mode 100644 briar-android/src/org/briarproject/android/util/HorizontalBorder.java delete mode 100644 briar-android/src/org/briarproject/android/util/LayoutUtils.java delete mode 100644 briar-android/src/org/briarproject/android/util/ListLoadingProgressBar.java diff --git a/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java b/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java deleted file mode 100644 index cf735c6b4..000000000 --- a/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.briarproject.android.util; - -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; -import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; -import android.view.ViewGroup; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; - -public class CommonLayoutParams { - - public static final ViewGroup.LayoutParams MATCH_MATCH = - new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT); - - public static final ViewGroup.LayoutParams MATCH_WRAP = - new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT); - - public static final ViewGroup.LayoutParams WRAP_WRAP = - new ViewGroup.LayoutParams(WRAP_CONTENT, WRAP_CONTENT); - - public static final LinearLayout.LayoutParams MATCH_WRAP_1 = - new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 1); - - public static final LinearLayout.LayoutParams WRAP_WRAP_1 = - new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1); - - public static RelativeLayout.LayoutParams relative() { - return new RelativeLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT); - } -} diff --git a/briar-android/src/org/briarproject/android/util/ElasticHorizontalSpace.java b/briar-android/src/org/briarproject/android/util/ElasticHorizontalSpace.java deleted file mode 100644 index 2a4ec2fa9..000000000 --- a/briar-android/src/org/briarproject/android/util/ElasticHorizontalSpace.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.briarproject.android.util; - -import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; -import android.content.Context; -import android.view.View; -import android.widget.LinearLayout.LayoutParams; - -public class ElasticHorizontalSpace extends View { - - public ElasticHorizontalSpace(Context ctx) { - super(ctx); - setLayoutParams(new LayoutParams(WRAP_CONTENT, 0, 1)); - } -} diff --git a/briar-android/src/org/briarproject/android/util/HorizontalBorder.java b/briar-android/src/org/briarproject/android/util/HorizontalBorder.java deleted file mode 100644 index 6e0f4f685..000000000 --- a/briar-android/src/org/briarproject/android/util/HorizontalBorder.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.briarproject.android.util; - -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; - -import org.briarproject.R; - -import android.content.Context; -import android.view.View; -import android.view.ViewGroup.LayoutParams; - -public class HorizontalBorder extends View { - - public HorizontalBorder(Context ctx) { - super(ctx); - setLayoutParams(new LayoutParams(MATCH_PARENT, 1)); - setBackgroundColor(getResources().getColor(R.color.horizontal_border)); - } -} diff --git a/briar-android/src/org/briarproject/android/util/LayoutUtils.java b/briar-android/src/org/briarproject/android/util/LayoutUtils.java deleted file mode 100644 index 4888b7f9f..000000000 --- a/briar-android/src/org/briarproject/android/util/LayoutUtils.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.briarproject.android.util; - -import android.content.Context; -import android.util.DisplayMetrics; -import android.view.WindowManager; - -import static android.content.Context.WINDOW_SERVICE; - -public class LayoutUtils { - - public static int getPadding(Context ctx) { - DisplayMetrics metrics = getDisplayMetrics(ctx); - int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100; - return percent + 7; - } - - private static DisplayMetrics getDisplayMetrics(Context ctx) { - DisplayMetrics metrics = new DisplayMetrics(); - WindowManager wm = (WindowManager) ctx.getSystemService(WINDOW_SERVICE); - wm.getDefaultDisplay().getMetrics(metrics); - return metrics; - } -} diff --git a/briar-android/src/org/briarproject/android/util/ListLoadingProgressBar.java b/briar-android/src/org/briarproject/android/util/ListLoadingProgressBar.java deleted file mode 100644 index edc9d9955..000000000 --- a/briar-android/src/org/briarproject/android/util/ListLoadingProgressBar.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.briarproject.android.util; - -import static android.view.Gravity.CENTER; -import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1; -import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP; -import android.content.Context; -import android.widget.LinearLayout; -import android.widget.ProgressBar; - -public class ListLoadingProgressBar extends LinearLayout { - - public ListLoadingProgressBar(Context ctx) { - super(ctx); - setLayoutParams(MATCH_WRAP_1); - setGravity(CENTER); - ProgressBar progress = new ProgressBar(ctx); - progress.setLayoutParams(WRAP_WRAP); - progress.setIndeterminate(true); - addView(progress); - } -}