Merge pull request #30 from krharsh17/AppFinalisation

code almost complete

Author: parthsharma07

app/src/main/java/in/krharsh17/programmersdate/events/LogoActivity.java

@@ -8,14 +8,17 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.util.Log;
+import android.view.View;
 import android.widget.FrameLayout;
+import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.aar.tapholdupbutton.TapHoldUpButton;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.storage.FileDownloadTask;
 import com.google.firebase.storage.FirebaseStorage;
+import com.peekandpop.shalskar.peekandpop.PeekAndPop;
 
 import org.opencv.core.DMatch;
 import org.opencv.core.Mat;
@@ -48,6 +51,8 @@ public class LogoActivity extends AppCompatActivity implements Constants {
     boolean isSuccess = false, safeToCapture = false;
     Handler handler;
     private TapHoldUpButton hint;
+    TextView hintText;
+    PeekAndPop peekAndPop;
 
     public static Camera getCameraInstance() {
         Camera c = null;
@@ -70,6 +75,13 @@ public void onBackPressed() {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_logo);
+        hint = findViewById(R.id.hint_button);
+        peekAndPop = new PeekAndPop.Builder(this)
+                .peekLayout(R.layout.dialog_hint)
+                .longClickViews(hint)
+                .build();
+        View peekView = peekAndPop.getPeekView();
+        hintText = peekView.findViewById(R.id.hint_text);
         mCamera = getCameraInstance();
         // Create our Preview view and set it as the content of our activity.
         mPreview = new CameraPreview(this, mCamera);
@@ -93,6 +105,7 @@ public void onCoupleFetched(Couple couple) {
                 currentlevel = couple.getCurrentLevel();
                 coupleId = couple.getId();
                 level = couple.getLevels().get(currentlevel-1);
+                hintText.setText(level.getLevelHint());
                 String root = Environment.getExternalStorageDirectory().toString();
                 File myDir = new File(root);
                 myDir.mkdirs();
@@ -126,6 +139,24 @@ public void onErrorOccured(String message) {
 
             }
         });
+
+        hint.setOnButtonClickListener(new TapHoldUpButton.OnButtonClickListener() {
+            @Override
+            public void onLongHoldStart(View v) {
+
+            }
+
+            @Override
+            public void onLongHoldEnd(View v) {
+
+            }
+
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
+
     }
 
     static {

app/src/main/java/in/krharsh17/programmersdate/models/Level.java

@@ -11,6 +11,16 @@ public class Level {
     private String poseValue;
     private String logoValue;
     private String audioValue;
+    private String levelHint;
+
+    public String getLevelHint() {
+        return levelHint;
+    }
+
+    public void setLevelHint(String levelHint) {
+        this.levelHint = levelHint;
+    }
+
     private boolean skipped;
 
     public boolean isSkipped() {

app/src/main/res/layout/dialog_hint.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:translationZ="5dp"
+    app:cardBackgroundColor="#10192B"
+    app:cardElevation="16dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="250dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="32dp">
+
+        <TextView
+            android:id="@+id/hint_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:fontFamily="@font/poiretone"
+            android:textAlignment="center"
+            android:textColor="@color/colorAccent"
+            android:textSize="18sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Are you sure you want to skip this level?" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>

openCVLibrary341/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar

@@ -1 +1 @@
-#Wed Jan 29 23:53:58 IST 2020
+#Thu Jan 30 00:33:04 IST 2020