Skip to content

Commit

Permalink
Update latest tools and prevent unwanted typecasts
Browse files Browse the repository at this point in the history
  • Loading branch information
@samagra14
samagra14 committed Feb 7, 2018
1 parent 0b5dd4c commit 87a8ef1
Show file tree
Hide file tree
Showing 10 changed files with 89 additions and 82 deletions.
14 changes: 7 additions & 7 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.1"
compileSdkVersion 27
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "com.sdsmdg.kd.trianglifyexample"
minSdkVersion 16
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -32,9 +32,9 @@ dependencies {

compile project(':trianglify')

compile 'com.android.support:appcompat-v7:25.0.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.github.QuadFlask:colorpicker:0.0.13'
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.github.QuadFlask:colorpicker:0.0.13'
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'org.mockito:mockito-core:2.11.0'
}
33 changes: 18 additions & 15 deletions app/src/main/java/com/sdsmdg/kd/trianglifyexample/AboutActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,19 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.style.UnderlineSpan;
import android.util.Log;
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.TextView;

import static com.sdsmdg.kd.trianglifyexample.CustomPalettePickerActivity.CUSTOM_PALETTE_COLOR_ARRAY;

public class AboutActivity extends AppCompatActivity {
private static final String TAG = "AboutActivity";

Expand Down Expand Up @@ -53,22 +50,26 @@ protected void onCreate(Bundle savedInstanceState) {


ActionBar actionBar = getSupportActionBar();
actionBar.setTitle(getString(R.string.about_activity_title));
if (actionBar != null) {
actionBar.setTitle(getString(R.string.about_activity_title));
}

try {
actionBar.setDisplayHomeAsUpEnabled(true);
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
}
} catch (java.lang.NullPointerException e) {
Log.e(TAG, "Null pointer exception in generating back action button");
}

versiontTextView = (TextView) this.findViewById(R.id.about_version_text);
versiontTextView = this.findViewById(R.id.about_version_text);

openSourceLicense = (TextView) this.findViewById(R.id.about_license_text);
openSourceLicense = this.findViewById(R.id.about_license_text);
openSourceLicense.setText(content);

githubLinkBtn = (ImageView) this.findViewById(R.id.about_github_link);
reviewLinkBtn = (ImageView) this.findViewById(R.id.about_rate_link);
shareLink = (ImageView) this.findViewById(R.id.about_share_link);
githubLinkBtn = this.findViewById(R.id.about_github_link);
reviewLinkBtn = this.findViewById(R.id.about_rate_link);
shareLink = this.findViewById(R.id.about_share_link);


versiontTextView.setText(getString(R.string.about_activity_version) + versionName);
Expand All @@ -93,9 +94,11 @@ public void onClick(View v) {
public void onClick(View v) {
Uri uri = Uri.parse("market://details?id=" + v.getContext().getPackageName());
Intent goToMarket = new Intent(Intent.ACTION_VIEW, uri);
goToMarket.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY |
Intent.FLAG_ACTIVITY_NEW_DOCUMENT |
Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
goToMarket.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY |
Intent.FLAG_ACTIVITY_NEW_DOCUMENT |
Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
}
try {
startActivity(goToMarket);
} catch (ActivityNotFoundException e) {
Expand Down
12 changes: 8 additions & 4 deletions app/src/main/java/com/sdsmdg/kd/trianglifyexample/CustomPalettePickerActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,17 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_custom_palette_picker);

try {
actionBar.setDisplayHomeAsUpEnabled(true);
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
}
} catch (java.lang.NullPointerException e) {
Log.e(TAG, "Null pointer exception in generating back action button");
}

try {
actionBar.setTitle("Custom Palette Picker");
if (actionBar != null) {
actionBar.setTitle("Custom Palette Picker");
}
} catch (java.lang.NullPointerException e) {
Log.e(TAG, "Null pointer exception on setting About activity title");
}
Expand All @@ -55,14 +59,14 @@ protected void onCreate(Bundle savedInstanceState) {

context = this;

trianglifyView = (TrianglifyView) findViewById(R.id.trianglify_custom_palette_view);
trianglifyView = findViewById(R.id.trianglify_custom_palette_view);
trianglifyView.setPalette(new Palette(colors));
trianglifyView.smartUpdate();

for (int i = 0; i < imageViews.length; i++) {
String imageViewNumber = "custom_palette_c" + String.valueOf(i);
int resID = getResources().getIdentifier(imageViewNumber, "id", getPackageName());
imageViews[i] = (ImageView) findViewById(resID);
imageViews[i] = findViewById(resID);
imageViews[i].setBackgroundColor(colors[i] + 0xff000000);

final int finalI = i;
Expand Down
21 changes: 10 additions & 11 deletions app/src/main/java/com/sdsmdg/kd/trianglifyexample/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
Expand All @@ -23,8 +22,8 @@
import android.widget.SeekBar;
import android.widget.Toast;

import com.sdsmdg.kd.trianglify.views.TrianglifyView;
import com.sdsmdg.kd.trianglify.models.Palette;
import com.sdsmdg.kd.trianglify.views.TrianglifyView;

import java.io.IOException;
import java.util.Random;
Expand All @@ -47,12 +46,12 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);


trianglifyView = (TrianglifyView) findViewById(R.id.trianglify_main_view);
trianglifyView = findViewById(R.id.trianglify_main_view);
trianglifyView.setBitmapQuality(TrianglifyView.DRAWING_CACHE_QUALITY_HIGH);

customPalette = trianglifyView.getPalette();

varianceSeekBar = (SeekBar) findViewById(R.id.variance_seekbar);
varianceSeekBar = findViewById(R.id.variance_seekbar);
varianceSeekBar.setMax(100);
varianceSeekBar.setProgress(trianglifyView.getVariance());
varianceSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
Expand All @@ -73,7 +72,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
}
});

cellSizeSeekBar = (SeekBar) findViewById(R.id.cell_size_seekbar);
cellSizeSeekBar = findViewById(R.id.cell_size_seekbar);
int maxCellSize = 150;

cellSizeSeekBar.setMax(maxCellSize);
Expand All @@ -96,7 +95,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
}
});

paletteSeekBar = (SeekBar) findViewById(R.id.palette_seekbar);
paletteSeekBar = findViewById(R.id.palette_seekbar);
paletteSeekBar.setMax(Palette.DEFAULT_PALETTE_COUNT - 1);
paletteSeekBar.setProgress(Palette.indexOf(trianglifyView.getPalette()));
paletteSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
Expand All @@ -118,7 +117,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
}
});

strokeCheckBox = (CheckBox) findViewById(R.id.draw_stroke_checkbox);
strokeCheckBox = findViewById(R.id.draw_stroke_checkbox);
strokeCheckBox.setChecked(trianglifyView.isDrawStrokeEnabled());
strokeCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
Expand All @@ -134,7 +133,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
}
});

fillCheckBox = (CheckBox) findViewById(R.id.draw_fill_checkbox);
fillCheckBox = findViewById(R.id.draw_fill_checkbox);
fillCheckBox.setChecked(trianglifyView.isFillTriangle());
fillCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
Expand All @@ -150,7 +149,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
}
});

randomColoringCheckbox = (CheckBox) findViewById(R.id.random_coloring_checkbox);
randomColoringCheckbox = findViewById(R.id.random_coloring_checkbox);
randomColoringCheckbox.setChecked(trianglifyView.isRandomColoringEnabled());
randomColoringCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
Expand All @@ -160,7 +159,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
}
});

customPaletteCheckbox = (CheckBox) findViewById(R.id.custom_palette_checkbox);
customPaletteCheckbox = findViewById(R.id.custom_palette_checkbox);
customPaletteCheckbox.setChecked(false);
customPaletteCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'

Expand All @@ -18,6 +19,7 @@ allprojects {
repositories {
jcenter()
maven { url "https://jitpack.io" }
google()
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Mar 17 23:32:27 GMT 2017
#Wed Feb 07 13:07:53 IST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
10 changes: 5 additions & 5 deletions trianglify/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ ext {
}

android {
compileSdkVersion 25
buildToolsVersion "25.0.1"
compileSdkVersion 27
buildToolsVersion '26.0.2'

defaultConfig {
minSdkVersion 16
targetSdkVersion 25
targetSdkVersion 27
versionCode 0
versionName "1.0.0"

Expand All @@ -58,9 +58,9 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.0.1'
implementation 'com.android.support:appcompat-v7:27.0.2'
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'org.mockito:mockito-core:2.11.0'

}

Expand Down
56 changes: 28 additions & 28 deletions trianglify/src/main/java/com/sdsmdg/kd/trianglify/models/Palette.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,34 @@
public class Palette {
public static final int DEFAULT_PALETTE_COUNT = 28;

public static final int YL_GN = 0;
public static final int YL = 1;
public static final int YL_GN_BU = 2;
public static final int GN_BU = 3;
public static final int BU_GN = 4;
public static final int PU_BU_GN = 5;
public static final int PU_BU = 6;
public static final int BU_PU = 7;
public static final int RD_PU = 8;
public static final int PU_RD = 9;
public static final int OR_RD = 10;
public static final int YL_OR_RD = 11;
public static final int YL_OR_BR = 12;
public static final int PURPLES = 13;
public static final int BLUES = 14;
public static final int GREENS = 15;
public static final int ORANGES = 16;
public static final int REDS = 17;
public static final int GREYS = 18;
public static final int PU_OR = 19;
public static final int BR_BL = 20;
public static final int PU_RD_GN = 21;
public static final int PI_YL_GN = 22;
public static final int RD_BU = 23;
public static final int RD_GY = 24;
public static final int RD_YL_BU = 25;
public static final int SPECTRAL = 26;
public static final int RD_YL_GN = 27;
private static final int YL_GN = 0;
private static final int YL = 1;
private static final int YL_GN_BU = 2;
private static final int GN_BU = 3;
private static final int BU_GN = 4;
private static final int PU_BU_GN = 5;
private static final int PU_BU = 6;
private static final int BU_PU = 7;
private static final int RD_PU = 8;
private static final int PU_RD = 9;
private static final int OR_RD = 10;
private static final int YL_OR_RD = 11;
private static final int YL_OR_BR = 12;
private static final int PURPLES = 13;
private static final int BLUES = 14;
private static final int GREENS = 15;
private static final int ORANGES = 16;
private static final int REDS = 17;
private static final int GREYS = 18;
private static final int PU_OR = 19;
private static final int BR_BL = 20;
private static final int PU_RD_GN = 21;
private static final int PI_YL_GN = 22;
private static final int RD_BU = 23;
private static final int RD_GY = 24;
private static final int RD_YL_BU = 25;
private static final int SPECTRAL = 26;
private static final int RD_YL_GN = 27;

private int[] colors;

Expand Down
15 changes: 7 additions & 8 deletions trianglify/src/main/java/com/sdsmdg/kd/trianglify/presenters/Presenter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@

import android.os.AsyncTask;

import com.sdsmdg.kd.trianglify.utilities.triangulator.DelaunayTriangulator;
import com.sdsmdg.kd.trianglify.models.Triangulation;
import com.sdsmdg.kd.trianglify.utilities.triangulator.NotEnoughPointsException;
import com.sdsmdg.kd.trianglify.utilities.triangulator.Vector2D;
import com.sdsmdg.kd.trianglify.utilities.colorizers.Colorizer;
import com.sdsmdg.kd.trianglify.utilities.colorizers.FixedPointsColorizer;
import com.sdsmdg.kd.trianglify.utilities.patterns.Circle;
import com.sdsmdg.kd.trianglify.utilities.patterns.Patterns;
import com.sdsmdg.kd.trianglify.utilities.patterns.Rectangle;
import com.sdsmdg.kd.trianglify.utilities.colorizers.Colorizer;
import com.sdsmdg.kd.trianglify.utilities.colorizers.FixedPointsColorizer;
import com.sdsmdg.kd.trianglify.views.TrianglifyView;
import com.sdsmdg.kd.trianglify.utilities.triangulator.DelaunayTriangulator;
import com.sdsmdg.kd.trianglify.utilities.triangulator.NotEnoughPointsException;
import com.sdsmdg.kd.trianglify.utilities.triangulator.Vector2D;
import com.sdsmdg.kd.trianglify.views.TrianglifyViewInterface;

import java.util.List;
Expand Down Expand Up @@ -120,7 +119,7 @@ private List<Vector2D> generateGrid() {
* Generates soup corresponding to current instance parameters
* @return triangulation generated
*/
public Triangulation getSoup() {
private Triangulation getSoup() {
if (generateOnlyColor) {
triangulation = generateColoredSoup(triangulation);
} else {
Expand All @@ -132,7 +131,7 @@ public Triangulation getSoup() {
/**
* Generates colored triangulation.
*/
public void generateSoup() {
private void generateSoup() {
triangulation = generateTriangulation(generateGrid());
triangulation = generateColoredSoup(triangulation);
}
Expand Down
Loading

0 comments on commit 87a8ef1

Please sign in to comment.