apk beta added

yasinhajilou · Jul 2, 2020 · cc0d6a6 · cc0d6a6
1 parent 989e770
commit cc0d6a6
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 10 deletions.
diff --git a/app/src/main/java/com/example/dileit/view/fragment/leitnerreview/ReviewReportFragment.java b/app/src/main/java/com/example/dileit/view/fragment/leitnerreview/ReviewReportFragment.java
@@ -67,6 +67,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             }
         });
 
-
+        mBinding.fabGoHome.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getActivity().finish();
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/example/dileit/view/fragment/wordinfo/WordInformationFragment.java b/app/src/main/java/com/example/dileit/view/fragment/wordinfo/WordInformationFragment.java
@@ -198,8 +198,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                 showRemoveLeitnerDialog(view16);
             } else {
                 builderTranslation = new StringBuilder();
-                for (TranslationWord word : wordList) {
-                    builderTranslation.append(word.getTranslatedWord()).append("\n");
+                if (wordList != null) {
+                    for (TranslationWord word : wordList) {
+                        builderTranslation.append(word.getTranslatedWord()).append("\n");
+                    }
                 }
 
                 //leitner id =0 means we should add brand new card

diff --git a/app/src/main/res/drawable/ic_round_home_24.xml b/app/src/main/res/drawable/ic_round_home_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,19v-5h4v5c0,0.55 0.45,1 1,1h3c0.55,0 1,-0.45 1,-1v-7h1.7c0.46,0 0.68,-0.57 0.33,-0.87L12.67,3.6c-0.38,-0.34 -0.96,-0.34 -1.34,0l-8.36,7.53c-0.34,0.3 -0.13,0.87 0.33,0.87H5v7c0,0.55 0.45,1 1,1h3c0.55,0 1,-0.45 1,-1z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -248,7 +248,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="8dp"
-        android:elevation="8dp"
         android:src="@drawable/ic_add_black_24dp"
         app:tint="@android:color/white"
         app:backgroundTint="@color/colorPrimary"

diff --git a/app/src/main/res/layout/fragment_review_report.xml b/app/src/main/res/layout/fragment_review_report.xml
@@ -1,18 +1,25 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+
+    android:orientation="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="com.example.dileit.view.fragment.leitnerreview.ReviewReportFragment">
 
     <com.google.android.material.card.MaterialCardView
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="98dp"
         android:layout_gravity="center"
         app:elevation="8dp"
         app:cardCornerRadius="8dp"
         app:backgroundTint="@android:color/white"
         android:layout_marginStart="18dp"
         android:layout_marginEnd="18dp"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content">
         <androidx.constraintlayout.widget.ConstraintLayout
             android:paddingBottom="8dp"
@@ -40,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:fontFamily="@font/productsansregular"
-                android:text="Reviewed Cards"
+                android:text="Reviewed "
                 android:textSize="22sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -67,7 +74,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:fontFamily="@font/productsansregular"
-                android:text="Review Again Cards For Today"
+                android:text="Review Again For Today"
                 android:textSize="22sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -112,4 +119,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
 
-</LinearLayout>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        app:tint="@android:color/white"
+        android:src="@drawable/ic_round_home_24"
+        android:layout_marginBottom="68dp"
+        android:id="@+id/fab_go_home"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/row_item_english_translation.xml b/app/src/main/res/layout/row_item_english_translation.xml
@@ -31,7 +31,7 @@
             android:textSize="19sp"
             android:fontFamily="@font/productsansregular"
             android:textStyle="bold"
-            android:text="Synonymos:"
+            android:text="Synonyms:"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
         <TextView