permission check

FireZenk · Feb 5, 2016 · 518c471 · 518c471
1 parent 3aaca42
commit 518c471
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 14 deletions.
diff --git a/library/src/main/java/org/firezenk/audiowaves/Visualizer.java b/library/src/main/java/org/firezenk/audiowaves/Visualizer.java
@@ -56,23 +56,29 @@ public class Visualizer extends LinearLayout implements IVisualizer {
     public Visualizer(Context context) {
         super(context);
         this.context = context;
-        this.init();
+        if(!isInEditMode()) {
+            this.init();
+        }
     }
 
     public Visualizer(Context context, AttributeSet attrs) {
         super(context, attrs);
         this.context = context;
 
-        this.attributes(attrs);
-        this.init();
+        if(!isInEditMode()){
+            this.attributes(attrs);
+            this.init();
+        }
     }
 
-    public Visualizer(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
+    public Visualizer(Context context, AttributeSet attrs, int defStyleAttr){
+            super(context, attrs, defStyleAttr);
         this.context = context;
 
-        this.attributes(attrs);
-        this.init();
+        if(!isInEditMode()){
+            this.attributes(attrs);
+            this.init();
+        }
     }
 
     private void attributes(AttributeSet attrs) {

diff --git a/sample/src/main/java/org/firezenk/audiowaves/sample/MainActivity.java b/sample/src/main/java/org/firezenk/audiowaves/sample/MainActivity.java
@@ -1,5 +1,8 @@
 package org.firezenk.audiowaves.sample;
 
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
@@ -9,12 +12,15 @@ public class MainActivity extends AppCompatActivity {
 
     @Override protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        ((Visualizer) findViewById(R.id.visualizer)).startListening();
+        int permissionCheck = ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO);
+        if(permissionCheck == PackageManager.PERMISSION_GRANTED) {
+            setContentView(R.layout.activity_main);
+            ((Visualizer) findViewById(R.id.visualizer)).startListening();
+        }
+        else {
+            setContentView(R.layout.no_mic);
+        }
     }
+
 }
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -29,6 +29,6 @@
         aw:aw_color_uniform="@color/red_light"
         aw:aw_color_is_gradient="true"
         aw:aw_color_gradient_start="@color/blue_light"
-        aw:aw_color_gradient_end="@color/red_light" />
+        aw:aw_color_gradient_end="@color/red_light"/>
 
 </RelativeLayout>
diff --git a/sample/src/main/res/layout/no_mic.xml b/sample/src/main/res/layout/no_mic.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="Please grant access to the microphone"
+        android:gravity="center"
+        android:layout_margin="10dp"
+        android:id="@+id/textView"
+        android:layout_gravity="center_horizontal" />
+</LinearLayout>