Skip to content

Commit bbbe00f

Browse files
author
therealbluepandabear
committed
Remove 'Rename' functionality due to bugs :(. Move 'Duplicate' out of beta phase.
1 parent 36c6d46 commit bbbe00f

5 files changed

Lines changed: 9 additions & 94 deletions

File tree

app/src/main/java/com/therealbluepandabear/pixapencil/activities/main/BottomSheetDialog.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ class BottomSheetDialog : BottomSheetDialogFragment() {
4545
caller.onViewDetailsTapped(pixelArt)
4646
}
4747

48-
binding.activityMainBottomSheetRename.setOnClickListener {
49-
caller.onRenameTapped(pixelArt, this)
50-
}
51-
5248
binding.activityMainBottomSheetDelete.setOnClickListener {
5349
caller.onDeleteTapped(pixelArt, this)
5450
}

app/src/main/java/com/therealbluepandabear/pixapencil/activities/main/MainActivity.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.takusemba.spotlight.Spotlight
1111
import com.therealbluepandabear.pixapencil.R
1212
import com.therealbluepandabear.pixapencil.activities.main.bottomsheet.extendedOnDeleteTapped
1313
import com.therealbluepandabear.pixapencil.activities.main.bottomsheet.extendedOnDuplicateTapped
14-
import com.therealbluepandabear.pixapencil.activities.main.bottomsheet.extendedOnRenameTapped
1514
import com.therealbluepandabear.pixapencil.activities.main.bottomsheet.extendedOnViewDetailsTapped
1615
import com.therealbluepandabear.pixapencil.activities.main.oncreate.root.extendedOnCreate
1716
import com.therealbluepandabear.pixapencil.activities.main.viewmodel.PixelArtViewModel
@@ -78,10 +77,6 @@ class MainActivity : AppCompatActivity(), RecentCreationsListener, NewProjectFra
7877
extendedOnViewDetailsTapped(pixelArt)
7978
}
8079

81-
override fun onRenameTapped(pixelArt: PixelArt, bottomSheetDialog: BottomSheetDialog) {
82-
extendedOnRenameTapped(pixelArt, bottomSheetDialog)
83-
}
84-
8580
override fun onDeleteTapped(pixelArt: PixelArt, bottomSheetDialog: BottomSheetDialog) {
8681
extendedOnDeleteTapped(pixelArt, bottomSheetDialog)
8782
}

app/src/main/java/com/therealbluepandabear/pixapencil/activities/main/bottomsheet/MainActivity+onRenameTapped.kt

Lines changed: 0 additions & 28 deletions
This file was deleted.

app/src/main/java/com/therealbluepandabear/pixapencil/listeners/BottomSheetDialogListener.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ import com.therealbluepandabear.pixapencil.models.PixelArt
66
interface BottomSheetDialogListener {
77
fun onDuplicateTapped(pixelArt: PixelArt, bottomSheetDialog: BottomSheetDialog)
88
fun onViewDetailsTapped(pixelArt: PixelArt)
9-
fun onRenameTapped(pixelArt: PixelArt, bottomSheetDialog: BottomSheetDialog)
109
fun onDeleteTapped(pixelArt: PixelArt, bottomSheetDialog: BottomSheetDialog)
1110
}
Lines changed: 9 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
android:layout_width="match_parent"
45
android:layout_height="wrap_content"
56
android:id="@+id/activityMainBottomSheet_root"
@@ -37,18 +38,6 @@
3738
app:layout_constraintStart_toEndOf="@+id/imageView6"
3839
app:layout_constraintTop_toTopOf="@+id/imageView8" />
3940

40-
<TextView
41-
android:id="@+id/textView7"
42-
android:layout_width="wrap_content"
43-
android:layout_height="wrap_content"
44-
android:layout_marginEnd="16dp"
45-
android:text="BETA"
46-
android:fontFamily="sans-serif-black"
47-
android:textColor="@android:color/holo_orange_dark"
48-
app:layout_constraintBottom_toBottomOf="@+id/imageView8"
49-
app:layout_constraintEnd_toEndOf="@+id/activityMainBottomSheet_duplicate"
50-
app:layout_constraintTop_toTopOf="@+id/imageView8" />
51-
5241
<TextView
5342
android:id="@+id/textView"
5443
android:layout_width="wrap_content"
@@ -60,17 +49,6 @@
6049
app:layout_constraintStart_toEndOf="@+id/imageView6"
6150
app:layout_constraintTop_toTopOf="@+id/imageView6" />
6251

63-
<TextView
64-
android:id="@+id/textView2"
65-
android:layout_width="wrap_content"
66-
android:layout_height="wrap_content"
67-
android:layout_marginStart="16dp"
68-
android:text="@string/activityMainBottomSheet_rename_str"
69-
android:textColor="@color/black_color_daynight"
70-
app:layout_constraintBottom_toBottomOf="@+id/imageView7"
71-
app:layout_constraintStart_toEndOf="@+id/imageView6"
72-
app:layout_constraintTop_toTopOf="@+id/imageView7" />
73-
7452
<TextView
7553
android:id="@+id/textView3"
7654
android:layout_width="wrap_content"
@@ -82,29 +60,17 @@
8260
app:layout_constraintStart_toEndOf="@+id/imageView6"
8361
app:layout_constraintTop_toTopOf="@+id/imageView9" />
8462

85-
<ImageView
86-
android:id="@+id/imageView7"
87-
android:layout_width="wrap_content"
88-
android:layout_height="wrap_content"
89-
android:layout_marginTop="32dp"
90-
app:tint="@color/black_color_daynight"
91-
app:layout_constraintEnd_toEndOf="@+id/imageView6"
92-
app:layout_constraintStart_toStartOf="@+id/imageView6"
93-
app:layout_constraintTop_toBottomOf="@+id/imageView6"
94-
app:srcCompat="@drawable/ic_baseline_pencil_24" />
95-
9663
<ImageView
9764
android:id="@+id/imageView9"
9865
android:layout_width="wrap_content"
9966
android:layout_height="wrap_content"
100-
app:tint="@color/black_color_daynight"
10167
android:layout_marginTop="32dp"
10268
android:layout_marginBottom="16dp"
10369
app:layout_constraintBottom_toBottomOf="parent"
104-
app:layout_constraintEnd_toEndOf="@+id/imageView7"
105-
app:layout_constraintStart_toStartOf="@+id/imageView7"
106-
app:layout_constraintTop_toBottomOf="@+id/imageView7"
107-
app:srcCompat="@drawable/ic_baseline_delete_24" />
70+
app:layout_constraintStart_toStartOf="@+id/imageView8"
71+
app:layout_constraintTop_toBottomOf="@+id/imageView6"
72+
app:srcCompat="@drawable/ic_baseline_delete_24"
73+
app:tint="@color/black_color_daynight" />
10874

10975
<View
11076
android:id="@+id/activityMainBottomSheet_duplicate"
@@ -123,37 +89,24 @@
12389
android:id="@+id/activityMainBottomSheet_viewDetails"
12490
android:layout_width="0dp"
12591
android:layout_height="0dp"
126-
android:layout_marginBottom="16dp"
12792
android:background="?android:attr/selectableItemBackground"
12893
android:clickable="true"
12994
android:focusable="true"
130-
app:layout_constraintBottom_toTopOf="@+id/textView2"
95+
app:layout_constraintBottom_toTopOf="@+id/activityMainBottomSheet_delete"
13196
app:layout_constraintEnd_toEndOf="parent"
13297
app:layout_constraintStart_toStartOf="parent"
13398
app:layout_constraintTop_toBottomOf="@+id/activityMainBottomSheet_duplicate" />
13499

135100
<View
136-
android:id="@+id/activityMainBottomSheet_rename"
101+
android:id="@+id/activityMainBottomSheet_delete"
137102
android:layout_width="0dp"
138103
android:layout_height="0dp"
139-
android:layout_marginBottom="16dp"
140-
android:background="?android:attr/selectableItemBackground"
141-
android:clickable="true"
142-
android:focusable="true"
143-
app:layout_constraintBottom_toTopOf="@+id/textView3"
144-
app:layout_constraintEnd_toEndOf="parent"
145-
app:layout_constraintStart_toStartOf="parent"
146-
app:layout_constraintTop_toBottomOf="@+id/activityMainBottomSheet_viewDetails" />
147-
148-
<View
149-
android:id="@+id/activityMainBottomSheet_delete"
104+
android:layout_marginTop="16dp"
150105
android:background="?android:attr/selectableItemBackground"
151106
android:clickable="true"
152107
android:focusable="true"
153-
android:layout_width="0dp"
154-
android:layout_height="0dp"
155108
app:layout_constraintBottom_toBottomOf="parent"
156109
app:layout_constraintEnd_toEndOf="parent"
157110
app:layout_constraintStart_toStartOf="parent"
158-
app:layout_constraintTop_toBottomOf="@+id/activityMainBottomSheet_rename" />
111+
app:layout_constraintTop_toBottomOf="@+id/textView" />
159112
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)