Skip to content

Commit 1e9b9f7

Browse files
committed
Add icons, first release
1 parent 9f05218 commit 1e9b9f7

File tree

10 files changed

+17
-4
lines changed

10 files changed

+17
-4
lines changed

app/src/main/ic_launcher-web.png

34.1 KB
Loading

app/src/main/java/ca/horatiu/convex_hull_visualizer/GridView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void refresh(){
130130
}
131131
else{ //use a LinkedList implementation instead .. lol
132132
for(Coordinate a : grid.getPoints()){
133-
canvas.drawCircle(a.getX(), a.getY(), settings.SKIP_VALUE/2, paint); //skip / 2 or Settings.SKIP?
133+
canvas.drawCircle(a.getX(), a.getY(), Settings.SKIP_VALUE /2, paint); //skip / 2 or Settings.SKIP?
134134
}
135135
}
136136

app/src/main/java/ca/horatiu/convex_hull_visualizer/MainActivity.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ca.horatiu.convex_hull_visualizer;
22

33
import android.content.Intent;
4+
import android.content.pm.ActivityInfo;
45
import android.graphics.PorterDuff;
56
import android.support.v4.view.GestureDetectorCompat;
67
import android.support.v7.app.ActionBarActivity;
@@ -58,6 +59,7 @@ public static Hull getHull(){
5859
@Override
5960
protected void onCreate(Bundle savedInstanceState) {
6061
super.onCreate(savedInstanceState);
62+
setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
6163
settings = new Settings(Settings.DEFAULT_START_X, Settings.DEFAULT_START_Y, Settings.DEFAULT_SKIP);
6264
Coordinate.populateColorConverter();
6365
gridRenderer = new GridView(this, grid, settings);
@@ -187,8 +189,8 @@ public boolean onSingleTapConfirmed(MotionEvent event) {
187189
yPos = GridView.height-1;
188190
}
189191

190-
int xIndex = (xPos/gridRenderer.getSkip() + gridRenderer.getXStart());
191-
int yIndex = (yPos/gridRenderer.getSkip() + gridRenderer.getYStart());
192+
int xIndex = (xPos/ GridView.getSkip() + gridRenderer.getXStart());
193+
int yIndex = (yPos/ GridView.getSkip() + gridRenderer.getYStart());
192194

193195
if (grid == null){
194196
grid = new Grid(gridRenderer.getWidth(), gridRenderer.getHeight());
@@ -199,7 +201,7 @@ public boolean onSingleTapConfirmed(MotionEvent event) {
199201
else
200202
grid.setTrue(xPos, yPos); //good enough
201203

202-
points.add(new Coordinate(xPos, yPos, gridRenderer.getSkip())); //change coordinates? ADD GET SKIP -> OK
204+
points.add(new Coordinate(xPos, yPos, GridView.getSkip())); //change coordinates? ADD GET SKIP -> OK
203205
grid.getPoints().add(new Coordinate(xPos, yPos, 1)); //standard...
204206
gridRenderer = new GridView(this, grid, settings);
205207
setContentView(R.layout.activity_main);
@@ -220,4 +222,10 @@ public void refresh(){
220222

221223
upper.addView(gridRenderer);
222224
}
225+
226+
@Override
227+
protected void onRestart() {
228+
super.onRestart();
229+
refresh();
230+
}
223231
}

app/src/main/java/ca/horatiu/convex_hull_visualizer/MyOnScaleGestureListener.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,6 @@ public boolean onScaleBegin(ScaleGestureDetector detector) {
6161

6262
@Override
6363
public void onScaleEnd(ScaleGestureDetector detector) {}
64+
65+
6466
}

app/src/main/java/ca/horatiu/convex_hull_visualizer/SettingsActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package ca.horatiu.convex_hull_visualizer;
22

3+
import android.content.pm.ActivityInfo;
34
import android.support.v7.app.AppCompatActivity;
45
import android.os.Bundle;
56
import android.support.v7.widget.Toolbar;
@@ -22,9 +23,11 @@ public class SettingsActivity extends AppCompatActivity implements AdapterView.O
2223
@Override
2324
protected void onCreate(Bundle savedInstanceState) {
2425
super.onCreate(savedInstanceState);
26+
setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
2527
setContentView(R.layout.activity_settings);
2628

2729

30+
2831
Spinner nodeColor = (Spinner) findViewById(R.id.spinner2);
2932
Spinner edgeColor = (Spinner) findViewById(R.id.spinner);
3033
SeekBar sizeSeek = (SeekBar) findViewById(R.id.seekBar);
-1.83 KB
Loading
-1.24 KB
Loading
-2.48 KB
Loading
-3.46 KB
Loading
-4.01 KB
Loading

0 commit comments

Comments
 (0)