Updates made

akshaaatt · Aug 14, 2021 · b3af04d · b3af04d
1 parent 5a31493
commit b3af04d
Show file tree

Hide file tree

Showing 6 changed files with 373 additions and 371 deletions.
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,66 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:background="@color/black"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/black">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:background="@color/light_black"
-        app:title="@string/app_name"
-        app:navigationIcon="@drawable/ic_puzzle"
+        app:layout_constraintBottom_toTopOf="@+id/animation_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/top"
-        app:titleTextColor="@color/white"/>
+        app:navigationIcon="@drawable/ic_puzzle"
+        app:title="@string/app_name"
+        app:titleTextColor="@color/white" />
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/animation_view"
-        android:layout_below="@id/toolbar"
-        android:layout_above="@id/selectMedia"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="40dp"
         android:background="@color/black"
+        app:layout_constraintBottom_toTopOf="@+id/selectMedia"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:lottie_autoPlay="true"
         app:lottie_loop="true"
         app:lottie_rawRes="@raw/media" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/selectMedia"
-        android:layout_above="@id/horizontalScroll"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="40dp"
-        android:layout_gravity="center"
+        android:layout_marginBottom="40dp"
+        android:backgroundTint="@color/light_black"
         android:clickable="true"
         android:focusable="true"
-        android:backgroundTint="@color/light_black"
         android:foreground="?attr/selectableItemBackground"
         android:text="@string/select_media"
         android:textColor="@color/teal_200"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/horizontalScroll"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/animation_view" />
 
     <HorizontalScrollView
-        android:scrollbarStyle="outsideOverlay"
-        android:layout_alignParentBottom="true"
         android:id="@+id/horizontalScroll"
-        android:paddingBottom="20dp"
-        android:clipToPadding="false"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="220dp"
         android:background="@color/black"
-        android:layout_height="200dp"
+        android:clipToPadding="false"
         android:paddingStart="8dp"
-        android:paddingEnd="0dp">
+        android:paddingEnd="0dp"
+        android:paddingBottom="20dp"
+        android:scrollbarStyle="outsideOverlay"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/selectMedia">
 
         <LinearLayout
-            android:orientation="horizontal"
             android:id="@+id/imageContainer"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:orientation="horizontal" />
 
     </HorizontalScrollView>
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/dazzle/src/main/java/com/limerse/dazzle/Dazzle.kt b/dazzle/src/main/java/com/limerse/dazzle/Dazzle.kt
@@ -28,7 +28,7 @@ import android.webkit.MimeTypeMap
 import androidx.appcompat.app.AppCompatActivity
 import androidx.camera.core.*
 import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.DrawableCompat
@@ -37,6 +37,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.limerse.dazzle.databinding.ActivityDazzleBinding
 import com.limerse.dazzle.gallery.BottomSheetMediaRecyclerAdapter
 import com.limerse.dazzle.gallery.BottomSheetMediaRecyclerAdapter.Companion.HEADER
@@ -45,15 +46,14 @@ import com.limerse.dazzle.gallery.InstantMediaRecyclerAdapter
 import com.limerse.dazzle.gallery.MediaModel
 import com.limerse.dazzle.interfaces.MediaClickInterface
 import com.limerse.dazzle.interfaces.PermissionCallback
+import com.limerse.dazzle.utils.DazzleOptions
 import com.limerse.dazzle.utils.GeneralUtils.getStringDate
 import com.limerse.dazzle.utils.GeneralUtils.manipulateBottomSheetVisibility
 import com.limerse.dazzle.utils.HeaderItemDecoration
 import com.limerse.dazzle.utils.MediaConstants.IMAGE_VIDEO_URI
 import com.limerse.dazzle.utils.MediaConstants.getFileFromUri
 import com.limerse.dazzle.utils.MediaConstants.getImageVideoCursor
 import com.limerse.dazzle.utils.PermissionUtils
-import com.limerse.dazzle.utils.DazzleOptions
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -336,10 +336,10 @@ class Dazzle : AppCompatActivity() {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 
                 // Display flash animation to indicate that photo was captured
-                mBinding.container.postDelayed({
-                    mBinding.container.foreground = ColorDrawable(Color.WHITE)
-                    mBinding.container.postDelayed(
-                        { mBinding.container.foreground = null }, ANIMATION_FAST_MILLIS
+                mBinding.coordinatorLayout.postDelayed({
+                    mBinding.coordinatorLayout.foreground = ColorDrawable(Color.WHITE)
+                    mBinding.coordinatorLayout.postDelayed(
+                        { mBinding.coordinatorLayout.foreground = null }, ANIMATION_FAST_MILLIS
                     )
                 }, ANIMATION_SLOW_MILLIS)
             }
@@ -449,6 +449,20 @@ class Dazzle : AppCompatActivity() {
         mBinding.textViewMessageBottom.visibility = GONE
 
         //start video
+        if (ActivityCompat.checkSelfPermission(
+                this,
+                Manifest.permission.RECORD_AUDIO
+            ) != 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
+        }
         videoCapture?.startRecording(
             mOutputFileOptions,
             cameraExecutor,
@@ -647,7 +661,7 @@ class Dazzle : AppCompatActivity() {
         }
     }
 
-    private var bottomSheetBehavior: BottomSheetBehavior<ConstraintLayout>? = null
+    private var bottomSheetBehavior: BottomSheetBehavior<View>? = null
 
     private fun handleBottomSheet() {
 
@@ -725,7 +739,6 @@ class Dazzle : AppCompatActivity() {
                         mInstantMediaAdapter?.imageCount = count
                         mBinding.textViewImageCount.text = count.toString()
                     }
-
                 }
 
                 val imageCount =