diff --git a/example/build.gradle b/example/build.gradle index 7b0e987..fb96fff 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "25.0.0" + compileSdkVersion 26 + buildToolsVersion "26.0.1" defaultConfig { applicationId "com.vlk.multimager.example" minSdkVersion 15 - targetSdkVersion 24 + targetSdkVersion 26 versionCode 5 versionName "1.0.4" @@ -34,7 +34,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:24.2.1' + compile 'com.android.support:appcompat-v7:26.+' compile('com.github.QuadFlask:colorpicker:0.0.10@aar') { transitive = true; } diff --git a/example/src/main/java/com/vlk/multimager/example/SampleActivity.java b/example/src/main/java/com/vlk/multimager/example/SampleActivity.java index d2f6b83..fdd658e 100644 --- a/example/src/main/java/com/vlk/multimager/example/SampleActivity.java +++ b/example/src/main/java/com/vlk/multimager/example/SampleActivity.java @@ -1,13 +1,10 @@ package com.vlk.multimager.example; -import android.Manifest; import android.content.DialogInterface; import android.content.Intent; -import android.content.pm.PackageManager; import android.content.res.TypedArray; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.StaggeredGridLayoutManager; @@ -18,7 +15,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; import com.flask.colorpicker.ColorPickerView; import com.flask.colorpicker.OnColorSelectedListener; @@ -124,7 +120,7 @@ private void handleResponseIntent(Intent intent) { recyclerView.setAdapter(imageAdapter); } - @OnClick({R.id.multiCaptureButton, R.id.multiPickerButton, R.id.customThemeButton, R.id.call, R.id.message, R.id.github}) + @OnClick({R.id.multiCaptureButton, R.id.multiPickerButton, R.id.customThemeButton, R.id.github}) public void onClick(View view) { switch (view.getId()) { case R.id.multiCaptureButton: @@ -139,12 +135,6 @@ public void onClick(View view) { case R.id.customThemeButton: setCustomTheme(); break; - case R.id.call: - initiateCall(); - break; - case R.id.message: - sendMessage(); - break; case R.id.github: navigateToUrl(); break; @@ -155,47 +145,6 @@ private void navigateToUrl() { startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/vansikrishna/Multimager.git"))); } - private void sendMessage() { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.fromParts("sms", "+918106064137", "Hello, I am very much pleased with the Multimager sample app posted on Github. Thank you."))); - } - - private void initiateCall() { - if (hasCallPermission(this)) { - Intent intent = new Intent(Intent.ACTION_CALL); - intent.setData(Uri.parse("tel:" + "+918106064137")); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) { - // TODO: Consider calling - // ActivityCompat#requestPermissions - // here to request the missing permissions, and then overriding - // public void onRequestPermissionsResult(int requestCode, String[] permissions, - // int[] grantResults) - // to handle the case where the user grants the permission. See the documentation - // for ActivityCompat#requestPermissions for more details. - return; - } - startActivity(intent); - } - else - requestCallPermissions(this, Constants.REQUEST_CALL_PERMS); - } - - @Override - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { - switch (requestCode) { - case Constants.REQUEST_CALL_PERMS: - if (validateGrantedPermissions(grantResults)) { - initiateCall(); - } else { - Toast.makeText(this, "Permissions not granted.", Toast.LENGTH_LONG).show(); - } - break; - default: { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - } - } - } - private void setCustomTheme() { ColorPickerDialogBuilder .with(this) diff --git a/example/src/main/res/layout/activity_sample.xml b/example/src/main/res/layout/activity_sample.xml index 3cbccfd..d802d62 100644 --- a/example/src/main/res/layout/activity_sample.xml +++ b/example/src/main/res/layout/activity_sample.xml @@ -82,7 +82,8 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_5" android:orientation="horizontal" - android:gravity="center"> + android:gravity="center" + android:visibility="gone"> -