From 318eabdf70884cd01c520290a201623a8b5e0270 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Fri, 21 Jun 2019 11:37:24 -0500 Subject: [PATCH] Refactor Size package --- .../com/otaliastudios/cameraview/size/AspectRatio.java | 1 + .../java/com/otaliastudios/cameraview/size/Size.java | 1 + .../otaliastudios/cameraview/size/SizeSelector.java | 2 -- .../cameraview/size/SizeSelectorParser.java | 10 ---------- .../otaliastudios/cameraview/size/SizeSelectors.java | 4 ---- 5 files changed, 2 insertions(+), 16 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java b/cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java index c8f0f11c..f16f0d6e 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/size/AspectRatio.java @@ -100,6 +100,7 @@ public class AspectRatio implements Comparable { return false; } + @NonNull @Override public String toString() { return mX + ":" + mY; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/size/Size.java b/cameraview/src/main/java/com/otaliastudios/cameraview/size/Size.java index 679fd23f..5d875e57 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/size/Size.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/size/Size.java @@ -49,6 +49,7 @@ public class Size implements Comparable { return false; } + @NonNull @Override public String toString() { return mWidth + "x" + mHeight; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelector.java b/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelector.java index 04317735..cea76421 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelector.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelector.java @@ -1,7 +1,5 @@ package com.otaliastudios.cameraview.size; -import com.otaliastudios.cameraview.size.Size; - import androidx.annotation.NonNull; import java.util.List; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelectorParser.java b/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelectorParser.java index b24cb2ed..6e5da0bb 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelectorParser.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelectorParser.java @@ -1,18 +1,8 @@ package com.otaliastudios.cameraview.size; -import android.content.Context; import android.content.res.TypedArray; import com.otaliastudios.cameraview.R; -import com.otaliastudios.cameraview.controls.Audio; -import com.otaliastudios.cameraview.controls.Facing; -import com.otaliastudios.cameraview.controls.Flash; -import com.otaliastudios.cameraview.controls.Grid; -import com.otaliastudios.cameraview.controls.Hdr; -import com.otaliastudios.cameraview.controls.Mode; -import com.otaliastudios.cameraview.controls.Preview; -import com.otaliastudios.cameraview.controls.VideoCodec; -import com.otaliastudios.cameraview.controls.WhiteBalance; import java.util.ArrayList; import java.util.List; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelectors.java b/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelectors.java index 5289035e..6f006cd8 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelectors.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/size/SizeSelectors.java @@ -1,9 +1,5 @@ package com.otaliastudios.cameraview.size; -import com.otaliastudios.cameraview.size.AspectRatio; -import com.otaliastudios.cameraview.size.Size; -import com.otaliastudios.cameraview.size.SizeSelector; - import androidx.annotation.NonNull; import java.util.ArrayList;