kenkeiras/mini-cards
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename test->main classes and update the theme.

Browse source
This commit is contained in:
kenkeiras 2017-07-09 11:00:08 -04:00
parent a961c55407
commit 1f5f9cb8de
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/codigoparallevar/minicards/PartCanvasView.java → app/src/main/java/com/codigoparallevar/minicards/CanvasView.java
View file

@ -27,7 +27,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
class PartCanvasView extends View {
class CanvasView extends View {
@NonNull
ArrayList<Part> parts = new ArrayList<>();
@ -48,12 +48,12 @@ class PartCanvasView extends View {
private String name = "default";
private final static float touchTimeForLongTouchInMillis = 500;
public PartCanvasView(Context context) {
public CanvasView(Context context) {
super(context);
init();
}
public PartCanvasView(Context context, AttributeSet attr){
public CanvasView(Context context, AttributeSet attr){
super(context, attr);
init();
}

17
app/src/main/java/com/codigoparallevar/minicards/TestActivity.java → app/src/main/java/com/codigoparallevar/minicards/MainActivity.java
View file

@ -5,12 +5,13 @@ import android.support.design.widget.Snackbar;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
public class TestActivity extends AppCompatActivity {
public class MainActivity extends AppCompatActivity {
PartCanvasView partCanvasView;
CanvasView canvasView;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -23,9 +24,9 @@ public class TestActivity extends AppCompatActivity {
}
// Use controled canvas
setContentView(R.layout.activity_test);
setContentView(R.layout.activity_main);
partCanvasView = (PartCanvasView) findViewById(R.id.canvasView);
canvasView = (CanvasView) findViewById(R.id.canvasView);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
@ -39,6 +40,12 @@ public class TestActivity extends AppCompatActivity {
@Override
public boolean onTouchEvent(MotionEvent event) {
return partCanvasView.onTouchEvent(event);
if (canvasView != null){
return canvasView.onTouchEvent(event);
}
Log.e("MainActivity", "CanvasView is null");
return super.onTouchEvent(event);
}
}