From 141d6497ef3e7bff125bb4d6e19513c313d85f54 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 26 Apr 2016 09:34:48 +0100
Subject: [PATCH] Removed unused layout code and imports.
---
.../android/SplashScreenActivity.java | 6 -----
.../android/forum/CreateForumActivity.java | 26 +++++++------------
.../android/util/FixedVerticalSpace.java | 18 -------------
.../android/util/LayoutUtils.java | 8 ++----
4 files changed, 12 insertions(+), 46 deletions(-)
delete mode 100644 briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
diff --git a/briar-android/src/org/briarproject/android/SplashScreenActivity.java b/briar-android/src/org/briarproject/android/SplashScreenActivity.java
index 20a6d59fae..c4cac86f54 100644
--- a/briar-android/src/org/briarproject/android/SplashScreenActivity.java
+++ b/briar-android/src/org/briarproject/android/SplashScreenActivity.java
@@ -1,29 +1,23 @@
package org.briarproject.android;
import android.content.Intent;
-import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
import android.os.StrictMode;
import android.os.StrictMode.ThreadPolicy;
import android.os.StrictMode.VmPolicy;
import android.support.v7.preference.PreferenceManager;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
import org.briarproject.R;
import org.briarproject.android.util.AndroidUtils;
-import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.db.DatabaseConfig;
import java.util.logging.Logger;
import javax.inject.Inject;
-import static android.view.Gravity.CENTER;
import static org.briarproject.android.TestingConstants.DEFAULT_LOG_LEVEL;
import static org.briarproject.android.TestingConstants.TESTING;
-import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
public class SplashScreenActivity extends BaseActivity {
diff --git a/briar-android/src/org/briarproject/android/forum/CreateForumActivity.java b/briar-android/src/org/briarproject/android/forum/CreateForumActivity.java
index 2a9d54cdf4..19a555c98e 100644
--- a/briar-android/src/org/briarproject/android/forum/CreateForumActivity.java
+++ b/briar-android/src/org/briarproject/android/forum/CreateForumActivity.java
@@ -2,12 +2,13 @@ package org.briarproject.android.forum;
import android.content.Intent;
import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;
-import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
@@ -16,7 +17,6 @@ import android.widget.Toast;
import org.briarproject.R;
import org.briarproject.android.AndroidComponent;
import org.briarproject.android.BriarActivity;
-import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.db.DbException;
import org.briarproject.api.forum.Forum;
import org.briarproject.api.forum.ForumSharingManager;
@@ -26,26 +26,16 @@ import java.util.logging.Logger;
import javax.inject.Inject;
-import android.text.TextWatcher;
-import android.text.Editable;
-
-import static android.text.InputType.TYPE_CLASS_TEXT;
-import static android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
-import static android.view.Gravity.CENTER;
-import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
-import static android.widget.LinearLayout.VERTICAL;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.forum.ForumActivity.FORUM_NAME;
-import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
-import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
import static org.briarproject.api.forum.ForumConstants.MAX_FORUM_NAME_LENGTH;
public class CreateForumActivity extends BriarActivity
-implements OnEditorActionListener, OnClickListener {
+ implements OnEditorActionListener, OnClickListener {
private static final Logger LOG =
Logger.getLogger(CreateForumActivity.class.getName());
@@ -56,7 +46,8 @@ implements OnEditorActionListener, OnClickListener {
private TextView feedback = null;
// Fields that are accessed from background threads must be volatile
- @Inject protected volatile ForumSharingManager forumSharingManager;
+ @Inject
+ protected volatile ForumSharingManager forumSharingManager;
@Override
public void onCreate(Bundle state) {
@@ -68,10 +59,13 @@ implements OnEditorActionListener, OnClickListener {
TextWatcher nameEntryWatcher = new TextWatcher() {
@Override
- public void afterTextChanged(Editable s) {}
+ public void afterTextChanged(Editable s) {
+ }
@Override
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+ public void beforeTextChanged(CharSequence s, int start, int count,
+ int after) {
+ }
@Override
public void onTextChanged(CharSequence text, int start,
diff --git a/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java b/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
deleted file mode 100644
index acd6b7e624..0000000000
--- a/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
+++ /dev/null
@@ -1,18 +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.view.ViewGroup.LayoutParams;
-
-public class FixedVerticalSpace extends View {
-
- public FixedVerticalSpace(Context ctx) {
- super(ctx);
- setHeight(LayoutUtils.getPadding(ctx));
- }
-
- public void setHeight(int height) {
- setLayoutParams(new LayoutParams(WRAP_CONTENT, height));
- }
-}
diff --git a/briar-android/src/org/briarproject/android/util/LayoutUtils.java b/briar-android/src/org/briarproject/android/util/LayoutUtils.java
index 0736448f6b..4888b7f9fa 100644
--- a/briar-android/src/org/briarproject/android/util/LayoutUtils.java
+++ b/briar-android/src/org/briarproject/android/util/LayoutUtils.java
@@ -1,10 +1,11 @@
package org.briarproject.android.util;
-import static android.content.Context.WINDOW_SERVICE;
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) {
@@ -13,11 +14,6 @@ public class LayoutUtils {
return percent + 7;
}
- public static int getLargeItemPadding(Context ctx) {
- DisplayMetrics metrics = getDisplayMetrics(ctx);
- return Math.min(metrics.widthPixels, metrics.heightPixels) / 4;
- }
-
private static DisplayMetrics getDisplayMetrics(Context ctx) {
DisplayMetrics metrics = new DisplayMetrics();
WindowManager wm = (WindowManager) ctx.getSystemService(WINDOW_SERVICE);
--
GitLab