diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d2127f978d..989a5376d1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -602,12 +602,6 @@ android:windowSoftInputMode="adjustResize" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> - - diff --git a/app/src/main/java/org/thoughtcrime/securesms/ClearAvatarPromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ClearAvatarPromptActivity.java deleted file mode 100644 index c668435cac..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/ClearAvatarPromptActivity.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.thoughtcrime.securesms; - - -import android.app.Activity; -import android.content.Intent; -import android.view.ContextThemeWrapper; - -import androidx.appcompat.app.AlertDialog; - -import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; -import org.thoughtcrime.securesms.util.DynamicTheme; - -public final class ClearAvatarPromptActivity extends Activity { - - private static final String ARG_TITLE = "arg_title"; - - public static Intent createForUserProfilePhoto() { - Intent intent = new Intent(ApplicationDependencies.getApplication(), ClearAvatarPromptActivity.class); - intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo); - return intent; - } - - public static Intent createForGroupProfilePhoto() { - Intent intent = new Intent(ApplicationDependencies.getApplication(), ClearAvatarPromptActivity.class); - intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_group_photo); - return intent; - } - - @Override - public void onResume() { - super.onResume(); - - int message = getIntent().getIntExtra(ARG_TITLE, 0); - - new AlertDialog.Builder(new ContextThemeWrapper(this, DynamicTheme.isDarkTheme(this) ? R.style.TextSecure_DarkTheme : R.style.TextSecure_LightTheme)) - .setMessage(message) - .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish()) - .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> { - Intent result = new Intent(); - result.putExtra("delete", true); - setResult(Activity.RESULT_OK, result); - finish(); - }) - .setOnCancelListener(dialog -> finish()) - .show(); - } - -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/ScaleTransition.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/ScaleTransition.kt deleted file mode 100644 index e0f8a3113b..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/ScaleTransition.kt +++ /dev/null @@ -1,116 +0,0 @@ -package org.thoughtcrime.securesms.stories - -import android.animation.Animator -import android.animation.AnimatorListenerAdapter -import android.animation.ObjectAnimator -import android.animation.PropertyValuesHolder.ofFloat -import android.content.Context -import android.transition.Transition -import android.transition.TransitionValues -import android.util.AttributeSet -import android.view.View -import android.view.ViewGroup -import androidx.core.view.ViewCompat - -class ScaleTransition : Transition { - - companion object { - - private const val LAYOUT_WIDTH = "ScaleTransition:layout_width" - private const val LAYOUT_HEIGHT = "ScaleTransition:layout_height" - private const val POSITION_X = "ScaleTransition:position_x" - private const val POSITION_Y = "ScaleTransition:position_y" - private const val SCALE_X = "ScaleTransition:scale_x" - private const val SCALE_Y = "ScaleTransition:scale_y" - - private val PROPERTIES = arrayOf( - LAYOUT_WIDTH, - LAYOUT_HEIGHT, - POSITION_X, - POSITION_Y, - SCALE_X, - SCALE_Y - ) - } - - constructor() : super() - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - override fun getTransitionProperties(): Array { - return PROPERTIES - } - - override fun captureStartValues(transitionValues: TransitionValues) { - if (ViewCompat.getTransitionName(transitionValues.view) == "story") { - captureValues(transitionValues) - } - } - - override fun captureEndValues(transitionValues: TransitionValues) { - if (ViewCompat.getTransitionName(transitionValues.view) == "story") { - resetValues(transitionValues.view) - captureValues(transitionValues) - } - } - - private fun captureValues(transitionValues: TransitionValues) = with(transitionValues.view) { - transitionValues.values[LAYOUT_WIDTH] = width.toFloat() - transitionValues.values[LAYOUT_HEIGHT] = height.toFloat() - transitionValues.values[POSITION_X] = x - transitionValues.values[POSITION_Y] = y - transitionValues.values[SCALE_X] = scaleX - transitionValues.values[SCALE_Y] = scaleY - } - - private fun resetValues(view: View) = with(view) { - translationX = 0f - translationY = 0f - scaleX = 1f - scaleY = 1f - } - - override fun createAnimator( - sceneRoot: ViewGroup, - start: TransitionValues?, - end: TransitionValues? - ): Animator? { - if (start == null || end == null) { - return null - } - - val startWidth = start.values[LAYOUT_WIDTH] as Float - val endWidth = end.values[LAYOUT_WIDTH] as Float - val startHeight = start.values[LAYOUT_HEIGHT] as Float - val endHeight = end.values[LAYOUT_HEIGHT] as Float - - val startX = start.values[POSITION_X] as Float - val endX = end.values[POSITION_X] as Float - val startY = start.values[POSITION_Y] as Float - val endY = end.values[POSITION_Y] as Float - - val startScaleX = start.values[SCALE_X] as Float - val startScaleY = start.values[SCALE_Y] as Float - - end.view.translationX = (startX - endX) - (endWidth - startWidth) / 2 - end.view.translationY = (startY - endY) - (endHeight - startHeight) / 2 - - end.view.scaleX = (startWidth / endWidth) * startScaleX - end.view.scaleY = (startHeight / endHeight) * startScaleY - - return ObjectAnimator.ofPropertyValuesHolder( - end.view, - ofFloat(View.TRANSLATION_X, 0f), - ofFloat(View.TRANSLATION_Y, 0f), - ofFloat(View.SCALE_X, 1f), - ofFloat(View.SCALE_Y, 1f) - ).apply { - addListener(object : AnimatorListenerAdapter() { - override fun onAnimationEnd(animation: Animator) { - resetValues(start.view) - resetValues(end.view) - } - }) - } - } -}