Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor app settings.

Browse Source
This commit is contained in:
Alex Hart
2021-05-12 13:02:44 -03:00
committed by Greyson Parrelli
parent a94d77d81e
commit f2d5ea0391
179 changed files with 5244 additions and 3894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperActivity.java
View File

@@ -14,7 +14,6 @@ import androidx.navigation.Navigation;
import org.thoughtcrime.securesms.PassphraseRequiredActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.ActivityTransitionUtil;
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -47,7 +46,6 @@ public final class ChatWallpaperActivity extends PassphraseRequiredActivity {
toolbar.setNavigationOnClickListener(unused -> {
if (!Navigation.findNavController(this, R.id.nav_host_fragment).popBackStack()) {
finish();
ActivityTransitionUtil.setSlideOutTransition(this);
}
});
@@ -59,12 +57,6 @@ public final class ChatWallpaperActivity extends PassphraseRequiredActivity {
}
}
@Override
public void onBackPressed() {
super.onBackPressed();
ActivityTransitionUtil.setSlideOutTransition(this);
}
@Override
protected void onResume() {
super.onResume();

11
app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperPreviewActivity.java
View File

@@ -8,10 +8,7 @@ import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import androidx.viewpager2.widget.ViewPager2;
import com.annimon.stream.Stream;
@@ -20,7 +17,6 @@ import org.thoughtcrime.securesms.PassphraseRequiredActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.ActivityTransitionUtil;
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.FullscreenHelper;
@@ -65,7 +61,6 @@ public class ChatWallpaperPreviewActivity extends PassphraseRequiredActivity {
toolbar.setNavigationOnClickListener(unused -> {
finish();
ActivityTransitionUtil.setSlideOutTransition(this);
});
viewPager.setAdapter(adapter);
@@ -95,12 +90,6 @@ public class ChatWallpaperPreviewActivity extends PassphraseRequiredActivity {
WindowUtil.setLightNavigationBarFromTheme(this);
}
@Override
public void onBackPressed() {
super.onBackPressed();
ActivityTransitionUtil.setSlideOutTransition(this);
}
@Override
protected void onResume() {
super.onResume();

3
app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java
View File

@@ -22,7 +22,6 @@ import com.google.android.flexbox.JustifyContent;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.util.ActivityTransitionUtil;
import org.thoughtcrime.securesms.wallpaper.crop.WallpaperImageSelectionActivity;
public class ChatWallpaperSelectionFragment extends Fragment {
@@ -52,7 +51,6 @@ public class ChatWallpaperSelectionFragment extends Fragment {
@SuppressWarnings("CodeBlock2Expr")
ChatWallpaperSelectionAdapter adapter = new ChatWallpaperSelectionAdapter(chatWallpaper -> {
startActivityForResult(ChatWallpaperPreviewActivity.create(requireActivity(), chatWallpaper, viewModel.getRecipientId(), viewModel.getDimInDarkTheme().getValue()), CHOOSE_WALLPAPER);
ActivityTransitionUtil.setSlideInTransition(requireActivity());
}, displayMetrics);
flexboxLayoutManager.setJustifyContent(JustifyContent.CENTER);
@@ -88,7 +86,6 @@ public class ChatWallpaperSelectionFragment extends Fragment {
.ifNecessary()
.onAllGranted(() -> {
startActivityForResult(WallpaperImageSelectionActivity.getIntent(requireContext(), viewModel.getRecipientId()), CHOOSE_WALLPAPER);
ActivityTransitionUtil.setSlideInTransition(requireActivity());
})
.onAnyDenied(() -> Toast.makeText(requireContext(), R.string.ChatWallpaperPreviewActivity__viewing_your_gallery_requires_the_storage_permission, Toast.LENGTH_SHORT)
.show())