diff --git a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt index ad81fe784..2cb9bcea4 100644 --- a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt @@ -14,6 +14,7 @@ import androidx.fragment.app.DialogFragment import androidx.lifecycle.lifecycleScope import com.github.libretube.R import com.github.libretube.obj.DeleteUserRequest +import com.github.libretube.requireMainActivityRestart import com.github.libretube.util.RetrofitInstance import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -60,13 +61,14 @@ class DeleteAccountDialog : DialogFragment() { val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE) val token = sharedPref?.getString("token", "")!! - val response = try { + try { RetrofitInstance.api.deleteAccount(token, DeleteUserRequest(password)) } catch (e: Exception) { Log.e(TAG, e.toString()) Toast.makeText(context, R.string.unknown_error, Toast.LENGTH_SHORT).show() return@launchWhenCreated } + requireMainActivityRestart = true Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show() logout() dialog?.dismiss() diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 1479e8963..1bcce0752 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -12,7 +12,7 @@ android:id="@+id/back_imageButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="20dp" + android:layout_marginLeft="15dp" android:layout_marginVertical="10dp" android:backgroundTint="@android:color/transparent" android:background="?android:selectableItemBackgroundBorderless" @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/settings" - android:layout_marginLeft="20dp" + android:layout_marginLeft="25dp" android:textSize="20sp" android:layout_gravity="center" /> diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_addtoplaylist.xml index c5b01143b..684ee0190 100644 --- a/app/src/main/res/layout/dialog_addtoplaylist.xml +++ b/app/src/main/res/layout/dialog_addtoplaylist.xml @@ -4,7 +4,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + style="@style/CustomDialogButton" + android:layout_marginRight="16dp"/> diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml index f6a44397a..9e84f7787 100644 --- a/app/src/main/res/layout/dialog_create_playlist.xml +++ b/app/src/main/res/layout/dialog_create_playlist.xml @@ -40,7 +40,8 @@