commit 6f3024ae1e9d913b6d17334554b265ec6f553f5c Author: Leszek Koltunski Date: Thu Dec 15 22:50:18 2016 +0000 Fix a lot of Lint warnings in the apps. diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index 5c08033..868f598 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -23,7 +23,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.opengl.GLES20; import android.opengl.GLSurfaceView; -import android.provider.Settings; import org.distorted.examples.R; import org.distorted.library.Distorted; diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldSurfaceView.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldSurfaceView.java index faee56e..1e43ca2 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldSurfaceView.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.aroundtheworld; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldSurfaceViewPicker.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldSurfaceViewPicker.java index 1f87f1f..6aaca78 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldSurfaceViewPicker.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldSurfaceViewPicker.java @@ -21,7 +21,6 @@ package org.distorted.examples.aroundtheworld; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; import android.view.MotionEvent; @@ -41,12 +40,6 @@ class AroundTheWorldSurfaceViewPicker extends GLSurfaceView if(!isInEditMode()) { setEGLContextClientVersion(2); - - if( Build.FINGERPRINT.startsWith("generic") ) - { - setEGLConfigChooser(8, 8, 8, 8, 16, 0); - } - mRenderer = new AroundTheWorldRendererPicker(); setRenderer(mRenderer); } diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java index d2f5526..84f5fa4 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java @@ -56,7 +56,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer /////////////////////////////////////////////////////////////////////////////////////////////////// - public CatAndDogRenderer(GLSurfaceView v) + CatAndDogRenderer(GLSurfaceView v) { mView = v; @@ -131,7 +131,7 @@ class CatAndDogRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - int duration = 10000; + int duration = 10000; // 10 seconds Dynamic3D diMove = new Dynamic3D(duration,0.0f); diMove.add(new Static3D(width-bmpWidth,height-bmpHeight,0)); diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogSurfaceView.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogSurfaceView.java index ed1ea0b..156ccfe 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogSurfaceView.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.catanddog; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/check/CheckSurfaceView.java b/src/main/java/org/distorted/examples/check/CheckSurfaceView.java index 830448f..9e0edd8 100644 --- a/src/main/java/org/distorted/examples/check/CheckSurfaceView.java +++ b/src/main/java/org/distorted/examples/check/CheckSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.check; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -37,8 +36,7 @@ class CheckSurfaceView extends GLSurfaceView if(!isInEditMode()) { setEGLContextClientVersion(2); - CheckRenderer renderer = new CheckRenderer(this); - setRenderer(renderer); + setRenderer(new CheckRenderer(this)); } } diff --git a/src/main/java/org/distorted/examples/cubes/CubesActivity.java b/src/main/java/org/distorted/examples/cubes/CubesActivity.java index d547073..2cdcf25 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesActivity.java +++ b/src/main/java/org/distorted/examples/cubes/CubesActivity.java @@ -108,7 +108,7 @@ public class CubesActivity extends Activity implements View.OnClickListener mShape = new boolean[mNumRows*mNumCols]; TableRow.LayoutParams p = new android.widget.TableRow.LayoutParams(); - + p.rightMargin = pad; p.leftMargin = pad; p.topMargin = pad; diff --git a/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java b/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java index b6baa30..4a9d33e 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java +++ b/src/main/java/org/distorted/examples/cubes/CubesSurfaceView.java @@ -23,7 +23,6 @@ import org.distorted.examples.R; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.Toast; @@ -101,7 +100,7 @@ class CubesSurfaceView extends GLSurfaceView float rz = mRenderer.mQuat2.getZ(); float rw = mRenderer.mQuat2.getW(); - // This is quaternion multiplication. (tx.ty.tz.tw) + // This is quaternion multiplication. (tx,ty,tz,tw) // is now equal to (qx,qy,qz,qw)*(rx,ry,rz,rw) float tx = rw*qx - rz*qy + ry*qz + rx*qw; float ty = rw*qy + rz*qx + ry*qw - rx*qz; diff --git a/src/main/java/org/distorted/examples/deform/DeformActivity.java b/src/main/java/org/distorted/examples/deform/DeformActivity.java index cfbf020..276921f 100644 --- a/src/main/java/org/distorted/examples/deform/DeformActivity.java +++ b/src/main/java/org/distorted/examples/deform/DeformActivity.java @@ -53,7 +53,7 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener barR.setProgress(50); - textR.setText("Radius: 50"); + textR.setText(getString(R.string.radius_placeholder,"50")); RadioButton effect = (RadioButton)findViewById(R.id.deformDistortButton); effect.setChecked(true); @@ -127,7 +127,7 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener { case R.id.deformSeekRadius: DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView); view.getRenderer().setRegionRadius(progress); - textR.setText("Radius: "+(progress<100 ? progress: "Infinity")); + textR.setText(getString(R.string.radius_placeholder,(progress<100 ? (""+progress): "Infinity") )); break; } } diff --git a/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java b/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java index 9d27c66..f2757dd 100644 --- a/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java +++ b/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.deform; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsSurfaceView.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsSurfaceView.java index 3290c04..3b32873 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsSurfaceView.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.differentbitmaps; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsSurfaceView.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsSurfaceView.java index 6027d19..9cd31cb 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsSurfaceView.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.differenteffects; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java b/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java index 270ac3c..a759b66 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.dynamic; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.view.MotionEvent; import android.util.AttributeSet; import android.graphics.Canvas; diff --git a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java index c406ec7..70401b5 100644 --- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java +++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java @@ -45,8 +45,8 @@ import org.distorted.library.type.Static3D; class EffectQueueRenderer implements GLSurfaceView.Renderer, EffectListener { private static final int NUMLINES = 10; - static final int BWID = 300; - static final int BHEI = 400; + final int BWID = 300; + final int BHEI = 400; private EffectQueueSurfaceView mView; private Paint mPaint; diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java index 1b2e375..acfecee 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java @@ -506,13 +506,6 @@ public class Effects3DActivity extends Activity return 0; } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public int getScreenHeight() - { - return 0; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// private void resetData() diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java b/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java index 4100197..f71e09f 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java @@ -648,7 +648,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener /////////////////////////////////////////////////////////////////////////////////////////////////// - public boolean thisView(View v) + boolean thisView(View v) { return v==mButton; } diff --git a/src/main/java/org/distorted/examples/fbo/FBOSurfaceView.java b/src/main/java/org/distorted/examples/fbo/FBOSurfaceView.java index 1047bd3..9446fff 100644 --- a/src/main/java/org/distorted/examples/fbo/FBOSurfaceView.java +++ b/src/main/java/org/distorted/examples/fbo/FBOSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.fbo; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/flag/FlagActivity.java b/src/main/java/org/distorted/examples/flag/FlagActivity.java index 74631d4..4d6f8e0 100644 --- a/src/main/java/org/distorted/examples/flag/FlagActivity.java +++ b/src/main/java/org/distorted/examples/flag/FlagActivity.java @@ -88,10 +88,10 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis barNoiseAngleA.setProgress ( (int)mNoise.getW() ); barNoiseAngleB.setProgress ( (int)mNoise.getV() ); - textNoiseAmplitude.setText("Noise 0.00"); - textNoiseLength.setText("Noise 0.00"); - textNoiseAngleA.setText("Noise 0.00"); - textNoiseAngleB.setText("Noise 0.00"); + textNoiseAmplitude.setText(getString(R.string.noise_placeholder,"0.00")); + textNoiseLength.setText(getString(R.string.noise_placeholder,"0.00")); + textNoiseAngleA.setText(getString(R.string.noise_placeholder,"0.00")); + textNoiseAngleB.setText(getString(R.string.noise_placeholder,"0.00")); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -145,39 +145,39 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis switch (bar.getId()) { case R.id.flagSeekAmplitude : renderer.setAmplitude(progress); - textAmplitude.setText("Amplitude "+progress); + textAmplitude.setText(getString(R.string.amplitude_placeholder,progress)); break; case R.id.flagSeekNoiseAmplitude: mNoise.set1((float)progress/100); renderer.setNoise(mNoise); convert(progress); - textNoiseAmplitude.setText("Noise "+mStr ); + textNoiseAmplitude.setText(getString(R.string.noise_placeholder,mStr)); break; case R.id.flagSeekLength : progress = progress*2; renderer.setLength(progress); - textLength.setText("Length "+progress); + textLength.setText(getString(R.string.length_placeholder,progress)); break; case R.id.flagSeekNoiseLength : mNoise.set2((float)progress/100); renderer.setNoise(mNoise); convert(progress); - textNoiseLength.setText("Noise "+mStr ); + textNoiseLength.setText(getString(R.string.noise_placeholder,mStr)); break; case R.id.flagSeekAngleA : progress = (360*progress)/100; renderer.setAngleA(progress); - textAngleA.setText("Alpha "+progress); + textAngleA.setText(getString(R.string.alpha_placeholder,progress)); break; case R.id.flagSeekNoiseAngleA : mNoise.set4((float)progress/100); renderer.setNoise(mNoise); convert(progress); - textNoiseAngleA.setText("Noise "+mStr ); + textNoiseAngleA.setText(getString(R.string.noise_placeholder,mStr)); break; case R.id.flagSeekAngleB : progress = ((360*progress)/100); renderer.setAngleB(progress); - textAngleB.setText("Beta "+progress); + textAngleB.setText(getString(R.string.beta_placeholder,progress)); break; case R.id.flagSeekNoiseAngleB : mNoise.set5((float)progress/100); renderer.setNoise(mNoise); convert(progress); - textNoiseAngleB.setText("Noise "+mStr ); + textNoiseAngleB.setText(getString(R.string.noise_placeholder,mStr)); break; } } diff --git a/src/main/java/org/distorted/examples/flag/FlagSurfaceView.java b/src/main/java/org/distorted/examples/flag/FlagSurfaceView.java index ef41a3d..254cd96 100644 --- a/src/main/java/org/distorted/examples/flag/FlagSurfaceView.java +++ b/src/main/java/org/distorted/examples/flag/FlagSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.flag; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/src/main/java/org/distorted/examples/girl/GirlActivity.java b/src/main/java/org/distorted/examples/girl/GirlActivity.java index c16eba5..5feb9e5 100644 --- a/src/main/java/org/distorted/examples/girl/GirlActivity.java +++ b/src/main/java/org/distorted/examples/girl/GirlActivity.java @@ -60,9 +60,9 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener barSize.setProgress(50); barHips.setProgress(0); - textSwing.setText("Swing: 0"); - textSize.setText("Size: 1.0"); - textHips.setText("Hips: 0"); + textSwing.setText(getString(R.string.swing_placeholder,0.0f)); + textSize.setText(getString(R.string.size_placeholder,1.0f)); + textHips.setText(getString(R.string.hips_placeholder,0.0f)); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -108,22 +108,16 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener { case R.id.girlSeekSwing: v = progress/5; view.getRenderer().setSwing(v); - textSwing.setText("Swing: "+v); + textSwing.setText(getString(R.string.swing_placeholder,v)); break; - case R.id.girlSeekSize : if( progress> 50) - { - s = (progress-50)/16.0f + 1.0f; - } - else - { - s = 0.015f*progress + 0.25f; - } + case R.id.girlSeekSize : if( progress> 50) s = (progress-50)/16.0f + 1.0f; + else s = 0.015f*progress + 0.25f; view.getRenderer().setSize(s); - textSize.setText("Size: "+(((int)(s*10))/10.0f)); + textSize.setText(getString(R.string.size_placeholder,(((int)(s*10))/10.0f))); break; case R.id.girlSeekHips : v = progress/5; view.getRenderer().setHips(v); - textHips.setText("Hips: "+v); + textHips.setText(getString(R.string.hips_placeholder,v)); break; } } diff --git a/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java b/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java index 391f5ca..1124f61 100644 --- a/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java +++ b/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.girl; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/listener/ListenerSurfaceView.java b/src/main/java/org/distorted/examples/listener/ListenerSurfaceView.java index e02498b..c0be3ac 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerSurfaceView.java +++ b/src/main/java/org/distorted/examples/listener/ListenerSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.listener; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java index 7084da2..4181c61 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java @@ -142,13 +142,6 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static boolean supportsRegion() - { - return false; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public static void setSupportsCenter(boolean supports) @@ -156,13 +149,6 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele mSupportsCenter = supports; } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static boolean supportsCenter() - { - return mSupportsCenter; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public Bitmap getBitmap() @@ -216,15 +202,7 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele return r.getWidth(); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public int getScreenHeight() - { - Matrix3DRenderer r = ((Matrix3DSurfaceView)findViewById(R.id.matrix3dSurfaceView)).getRenderer(); - return r.getHeight(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////// public void onItemSelected(AdapterView parent, View view, int pos, long id) { diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java index b0e3feb..3f0a2b4 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java @@ -648,7 +648,7 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener /////////////////////////////////////////////////////////////////////////////////////////////////// - public boolean thisView(View v) + boolean thisView(View v) { return v==mButton; } diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DSurfaceView.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DSurfaceView.java index 057cfdb..7aaf705 100644 --- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DSurfaceView.java +++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DSurfaceView.java @@ -21,9 +21,7 @@ package org.distorted.examples.matrix3d; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; -import android.view.MotionEvent; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaSurfaceView.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaSurfaceView.java index 243abc6..955f51e 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaSurfaceView.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.monalisa; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicSurfaceView.java b/src/main/java/org/distorted/examples/olimpic/OlimpicSurfaceView.java index 662e11e..0c774d7 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicSurfaceView.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.olimpic; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/projection/ProjectionActivity.java b/src/main/java/org/distorted/examples/projection/ProjectionActivity.java index a47419e..b2252dd 100644 --- a/src/main/java/org/distorted/examples/projection/ProjectionActivity.java +++ b/src/main/java/org/distorted/examples/projection/ProjectionActivity.java @@ -102,13 +102,13 @@ public class ProjectionActivity extends Activity implements OnSeekBarChangeListe switch (bar.getId()) { case R.id.projectionSeekFOV: ret = renderer.setFOV(progress); - textF.setText("FOV: "+ret); + textF.setText(getString(R.string.fov_placeholder,ret)); break; case R.id.projectionSeekX : ret = renderer.setX(progress); - textX.setText("X: "+ret); + textX.setText(getString(R.string.x_placeholder,ret)); break; case R.id.projectionSeekY : ret = renderer.setY(progress); - textY.setText("Y: "+ret); + textY.setText(getString(R.string.y_placeholder,ret)); break; } } diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionSurfaceView.java b/src/main/java/org/distorted/examples/quaternion/QuaternionSurfaceView.java index ae37586..9e44a76 100644 --- a/src/main/java/org/distorted/examples/quaternion/QuaternionSurfaceView.java +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.quaternion; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/save/SaveSurfaceView.java b/src/main/java/org/distorted/examples/save/SaveSurfaceView.java index a0a36ca..3af4e1a 100644 --- a/src/main/java/org/distorted/examples/save/SaveSurfaceView.java +++ b/src/main/java/org/distorted/examples/save/SaveSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.save; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/sink/SinkSurfaceView.java b/src/main/java/org/distorted/examples/sink/SinkSurfaceView.java index b4a9217..c7772f0 100644 --- a/src/main/java/org/distorted/examples/sink/SinkSurfaceView.java +++ b/src/main/java/org/distorted/examples/sink/SinkSurfaceView.java @@ -21,7 +21,6 @@ package org.distorted.examples.sink; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/wind/WindActivity.java b/src/main/java/org/distorted/examples/wind/WindActivity.java index 367cf0a..7068c71 100644 --- a/src/main/java/org/distorted/examples/wind/WindActivity.java +++ b/src/main/java/org/distorted/examples/wind/WindActivity.java @@ -50,7 +50,7 @@ public class WindActivity extends Activity implements OnSeekBarChangeListener bar.setProgress(50); - windText.setText("Wind: 50"); + windText.setText(getString(R.string.wind_placeholder,50)); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -90,7 +90,7 @@ public class WindActivity extends Activity implements OnSeekBarChangeListener { case R.id.windSeek:WindSurfaceView view = (WindSurfaceView) this.findViewById(R.id.windSurfaceView); view.getRenderer().setWind(progress); - windText.setText("Wind: "+progress); + windText.setText(getString(R.string.wind_placeholder,progress)); break; } } diff --git a/src/main/java/org/distorted/examples/wind/WindSurfaceView.java b/src/main/java/org/distorted/examples/wind/WindSurfaceView.java index a1be5eb..223ad42 100644 --- a/src/main/java/org/distorted/examples/wind/WindSurfaceView.java +++ b/src/main/java/org/distorted/examples/wind/WindSurfaceView.java @@ -21,9 +21,7 @@ package org.distorted.examples.wind; import android.content.Context; import android.opengl.GLSurfaceView; -import android.os.Build; import android.util.AttributeSet; -import android.view.MotionEvent; /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a486247..6e002a2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -58,6 +58,20 @@ Alpha Beta + Radius: %1$s + Noise %1$s + Length %1$d + Amplitude %1$d + Alpha %1$d + Beta %1$d + Swing %1$f + Size %1$f + Hips %1$f + FOV: %1$d + X: %1$d + Y: %1$d + Wind: %1$d + Mona Lisa The basics of Distortions. Dog