diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dec67e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +.classpath +.project +.settings +eclipsebin + +bin +gen +build +out +lib + +.idea +*.iml +classes + +obj + +.DS_Store + +# Gradle +.gradle +jniLibs +build +local.properties +reports \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..c6ee151 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +Change Log +========== + +Version 0.1.0 *(2017-02-01)* +---------------------------- + +Initial version. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..37a7c41 --- /dev/null +++ b/README.md @@ -0,0 +1,49 @@ +Android Units +========== + +A utility class for converting between different Android display units + + + +Example Usage +------------- + +How can I get the pixels for the display pixel (dp) measurement I have? +```java +float topPaddingOrSomething = AndroidUnits.DENSITY_PIXELS.toPixels(8); +``` + + +Download +-------- + +Add via Gradle: +```groovy +compile 'com.github.kevelbreh:androidunits:0.1.0' +``` +or Maven: +```xml + + com.github.kevelbre + androidunits + 0.1.0 + +``` + + +License +------- + + Copyright 2017 Kevin Woodland + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/androidunits/build.gradle b/androidunits/build.gradle new file mode 100644 index 0000000..da030a2 --- /dev/null +++ b/androidunits/build.gradle @@ -0,0 +1,22 @@ +apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' + +group='com.github.kevelbreh' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.2" + + defaultConfig { + minSdkVersion 9 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + testCompile 'junit:junit:4.12' +} diff --git a/androidunits/src/androidTest/java/com/github/kevelbreh/androidunits/ExampleInstrumentedTest.java b/androidunits/src/androidTest/java/com/github/kevelbreh/androidunits/ExampleInstrumentedTest.java new file mode 100644 index 0000000..594bdcf --- /dev/null +++ b/androidunits/src/androidTest/java/com/github/kevelbreh/androidunits/ExampleInstrumentedTest.java @@ -0,0 +1,34 @@ +package com.github.kevelbreh.androidunits; + +import android.content.res.Resources; +import android.support.test.runner.AndroidJUnit4; + +import android.util.DisplayMetrics; +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.assertEquals; + +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + + @Test public void conversions() throws Exception { + DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics(); + + for (float s = 0; s < 999; s++) { + assertEquals(s, AndroidUnit.PIXELS.toPixels(s), 0); + assertEquals(s / metrics.density, AndroidUnit.PIXELS.toDisplayPixels(s), 0); + assertEquals(s / metrics.scaledDensity, AndroidUnit.PIXELS.toScalePixels(s), 0); + + assertEquals(s * metrics.density, AndroidUnit.DENSITY_PIXELS.toPixels(s), 0); + assertEquals(s, AndroidUnit.DENSITY_PIXELS.toDisplayPixels(s), 0); + assertEquals(s * (metrics.density / metrics.scaledDensity), + AndroidUnit.DENSITY_PIXELS.toScalePixels(s), 0); + + assertEquals(s * metrics.scaledDensity, AndroidUnit.SCALE_PIXELS.toPixels(s), 0); + assertEquals(s * (metrics.scaledDensity / metrics.density), + AndroidUnit.SCALE_PIXELS.toDisplayPixels(s), 0); + assertEquals(s, AndroidUnit.SCALE_PIXELS.toScalePixels(s), 0); + } + } +} diff --git a/androidunits/src/main/AndroidManifest.xml b/androidunits/src/main/AndroidManifest.xml new file mode 100644 index 0000000..685de71 --- /dev/null +++ b/androidunits/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/androidunits/src/main/java/com/github/kevelbreh/androidunits/AndroidUnit.java b/androidunits/src/main/java/com/github/kevelbreh/androidunits/AndroidUnit.java new file mode 100644 index 0000000..74b918a --- /dev/null +++ b/androidunits/src/main/java/com/github/kevelbreh/androidunits/AndroidUnit.java @@ -0,0 +1,106 @@ +package com.github.kevelbreh.androidunits; + +import android.content.Context; +import android.content.res.Resources; +import android.util.DisplayMetrics; + +/** + * {@code AndroidUnit} is a utility to convert between the different display units used when laying + * out android views. {@code AndroidUnit} doesn't care about android the {@link Context}. + */ +public enum AndroidUnit { + + PIXELS { + @Override public float convert(float sourceCount, AndroidUnit sourceUnit) { + return sourceUnit.toPixels(sourceCount); + } + + @Override public float toPixels(float count) { + return count; + } + + @Override public float toDisplayPixels(float count) { + return count / DISPLAY_METRICS.density; + } + + @Override public float toScalePixels(float count) { + return count / DISPLAY_METRICS.scaledDensity; + } + }, + + DENSITY_PIXELS { + @Override public float convert(float sourceCount, AndroidUnit sourceUnit) { + return sourceUnit.toDisplayPixels(sourceCount); + } + + @Override public float toPixels(float count) { + return count * DISPLAY_METRICS.density; + } + + @Override public float toDisplayPixels(float count) { + return count; + } + + @Override public float toScalePixels(float count) { + return count * (DISPLAY_METRICS.scaledDensity / DISPLAY_METRICS.density); + } + }, + + SCALE_PIXELS { + @Override public float convert(float sourceCount, AndroidUnit sourceUnit) { + return sourceUnit.toScalePixels(sourceCount); + } + + @Override public float toPixels(float count) { + return count * DISPLAY_METRICS.scaledDensity; + } + + @Override public float toDisplayPixels(float count) { + return count * (DISPLAY_METRICS.density / DISPLAY_METRICS.scaledDensity); + } + + @Override public float toScalePixels(float count) { + return count; + } + }; + + private static final DisplayMetrics DISPLAY_METRICS = Resources.getSystem().getDisplayMetrics(); + + /** + * Converts the given size in the given unit to this unit. + * + * @param sourceCount the size in the given {@code sourceUnit}. + * @param sourceUnit the unit of the {@code sourceCount} argument. + * @return the converted size of the unit + */ + public float convert(float sourceCount, AndroidUnit sourceUnit) { + throw new AbstractMethodError(); + } + + /** + * Convert from a source unit count to a pixel count + * @param count the source unit count + * @return the converted source to a pixel count + */ + public float toPixels(float count) { + throw new AbstractMethodError(); + } + + /** + * Convert from a source unit count to a density independent pixel count + * @param count the source unit count + * @return the converted density independent pixel count + */ + public float toDisplayPixels(float count) { + throw new AbstractMethodError(); + } + + /** + * Convert from a source unit count to a scaled independent pixel count + * @param count the source unit count + * @return the converted scaled independent pixel count + */ + public float toScalePixels(float count) { + throw new AbstractMethodError(); + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b520515 --- /dev/null +++ b/build.gradle @@ -0,0 +1,19 @@ +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..aac7c9b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..04e285f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..fd455dc --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':androidunits'