diff --git a/app/build.gradle b/app/build.gradle
index f1d8f62..119e145 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ 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.+'
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
+ compile 'com.android.support:appcompat-v7:25.3.1'
+ compile 'com.android.support:design:25.3.1'
testCompile 'junit:junit:4.12'
}
diff --git a/app/src/main/java/de/trac/spherical/MainActivity.java b/app/src/main/java/de/trac/spherical/MainActivity.java
index 5682ec4..4a19bbd 100644
--- a/app/src/main/java/de/trac/spherical/MainActivity.java
+++ b/app/src/main/java/de/trac/spherical/MainActivity.java
@@ -3,12 +3,14 @@ package de.trac.spherical;
import android.content.Intent;
import android.graphics.BitmapFactory;
import android.net.Uri;
+import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
+import android.widget.LinearLayout;
import android.widget.Toast;
import java.io.FileNotFoundException;
@@ -30,21 +32,38 @@ public class MainActivity extends AppCompatActivity {
private SphereSurfaceView surfaceView;
private Renderer renderer;
+ private FloatingActionButton fab;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
// Initialize renderer and setup surface view.
surfaceView = new SphereSurfaceView(this);
renderer = new Renderer(surfaceView);
- setContentView(surfaceView);
+ ((LinearLayout) findViewById(R.id.container)).addView(surfaceView);
+
+ fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ SphereSurfaceView.USE_TOUCH = !SphereSurfaceView.USE_TOUCH;
+ fab.hide();
+ }
+ });
+ fab.hide();
+
// Detect gestures like single taps.
final GestureDetector mGesDetect = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onSingleTapConfirmed(MotionEvent event) {
- SphereSurfaceView.USE_TOUCH = !SphereSurfaceView.USE_TOUCH;
+ if (fab.isShown()) {
+ fab.hide();
+ } else {
+ fab.show();
+ }
return true;
}
});
diff --git a/app/src/main/res/drawable/ic_explore_white_48px.xml b/app/src/main/res/drawable/ic_explore_white_48px.xml
new file mode 100644
index 0000000..f977453
--- /dev/null
+++ b/app/src/main/res/drawable/ic_explore_white_48px.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9d793ef..b465508 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,29 @@
-
-
+
+
+
-
+ app:layout_anchor="@id/container"
+ app:layout_anchorGravity="bottom|right|end" />
-
+