Merge branch 'develop' of https://github.com/TeamFILL-IN/Andro-FILLIN …

…into feature/#75 � Conflicts: � app/src/main/res/layout/fragment_photo_dialog.xml
TeamFILL-IN · Feb 20, 2022 · 55d7f40 · 55d7f40
2 parents e4f0fcb + ab213aa
commit 55d7f40
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 9 deletions.
diff --git a/app/src/main/res/drawable-hdpi/and_photo_rectangle.png b/app/src/main/res/drawable-hdpi/and_photo_rectangle.png
diff --git a/app/src/main/res/drawable-hdpi/and_photoframe.png b/app/src/main/res/drawable-hdpi/and_photoframe.png
diff --git a/app/src/main/res/drawable-mdpi/and_photo_rectangle.png b/app/src/main/res/drawable-mdpi/and_photo_rectangle.png
diff --git a/app/src/main/res/drawable-mdpi/and_photoframe.png b/app/src/main/res/drawable-mdpi/and_photoframe.png
diff --git a/app/src/main/res/drawable-v24/unlike.png b/app/src/main/res/drawable-v24/unlike.png
diff --git a/app/src/main/res/drawable-xhdpi/and_photo_rectangle.png b/app/src/main/res/drawable-xhdpi/and_photo_rectangle.png
diff --git a/app/src/main/res/drawable-xhdpi/and_photoframe.png b/app/src/main/res/drawable-xhdpi/and_photoframe.png
diff --git a/app/src/main/res/drawable-xxhdpi/and_photo_rectangle.png b/app/src/main/res/drawable-xxhdpi/and_photo_rectangle.png
diff --git a/app/src/main/res/drawable-xxhdpi/and_photoframe.png b/app/src/main/res/drawable-xxhdpi/and_photoframe.png
diff --git a/app/src/main/res/drawable-xxxhdpi/and_photo_rectangle.png b/app/src/main/res/drawable-xxxhdpi/and_photo_rectangle.png
diff --git a/app/src/main/res/drawable-xxxhdpi/and_photoframe.png b/app/src/main/res/drawable-xxxhdpi/and_photoframe.png
diff --git a/app/src/main/res/layout/fragment_photo_dialog.xml b/app/src/main/res/layout/fragment_photo_dialog.xml
@@ -75,7 +75,6 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:scaleType="fitXY"
-            android:src="@drawable/and_photoframe"
             app:layout_constraintBottom_toBottomOf="@id/cl_image"
             app:layout_constraintEnd_toEndOf="@id/cl_image"
             app:layout_constraintStart_toStartOf="@id/cl_image"

diff --git a/app/src/main/res/layout/item_category_image.xml b/app/src/main/res/layout/item_category_image.xml
@@ -12,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:scaleType="centerInside"
-        android:src="@drawable/and_photo_rectangle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

diff --git a/app/src/main/res/layout/item_film_roll_pic.xml b/app/src/main/res/layout/item_film_roll_pic.xml
@@ -60,7 +60,6 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:scaleType="center"
-            android:src="@drawable/and_photoframe"
             app:layout_constraintLeft_toLeftOf="@id/cl_image"
             app:layout_constraintRight_toRightOf="@id/cl_image"
             app:layout_constraintTop_toBottomOf="@id/cl_image"
@@ -107,7 +106,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:backgroundTint="@color/fillin_black"
-            android:src="@drawable/unlike"
             android:layout_gravity="center"/>
 
     </LinearLayout>

diff --git a/app/src/main/res/layout/item_my_page.xml b/app/src/main/res/layout/item_my_page.xml
@@ -12,8 +12,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/and_photo_rectangle"/>
+        android:layout_height="wrap_content"/>
 
 
 

diff --git a/app/src/main/res/layout/item_new_photos_list.xml b/app/src/main/res/layout/item_new_photos_list.xml
@@ -12,7 +12,6 @@
         android:overScrollMode="never"
         android:scaleType="centerInside"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@drawable/and_photo_rectangle" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_photo_review.xml b/app/src/main/res/layout/item_photo_review.xml
@@ -9,7 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="center"
-        android:src="@drawable/and_photo_rectangle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"