TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 17:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix theming issue in CameraContactSelectionFragment.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-02-21 10:30:26 -05:00
parent 739e38a047
commit e62e630987
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraContactSelectionFragment.java
View File

@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.InviteActivity;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.ThemeUtil;
@ -75,8 +76,8 @@ public class CameraContactSelectionFragment extends Fragment implements CameraCo
@Override @Override
public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
int theme = TextSecurePreferences.getTheme(inflater.getContext()).equals("light") ? R.style.TextSecure_LightTheme int theme = DynamicTheme.isDarkTheme(inflater.getContext()) ? R.style.TextSecure_DarkTheme
: R.style.TextSecure_DarkTheme; : R.style.TextSecure_LightTheme;
return ThemeUtil.getThemedInflater(inflater.getContext(), inflater, theme) return ThemeUtil.getThemedInflater(inflater.getContext(), inflater, theme)
.inflate(R.layout.camera_contact_selection_fragment, container, false); .inflate(R.layout.camera_contact_selection_fragment, container, false);
} }

29
app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
View File

@ -1,13 +1,13 @@
package org.thoughtcrime.securesms.util; package org.thoughtcrime.securesms.util;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Build; import android.os.Build;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.StyleRes; import androidx.annotation.StyleRes;
import androidx.appcompat.app.AppCompatDelegate;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
@ -35,15 +35,7 @@ public class DynamicTheme {
} }
private @StyleRes int getSelectedTheme(Activity activity) { private @StyleRes int getSelectedTheme(Activity activity) {
String theme = TextSecurePreferences.getTheme(activity); if (isDarkTheme(activity)) {
if (theme.equals(SYSTEM) && systemThemeAvailable()) {
if (isSystemInDarkTheme(activity)) {
return getDarkThemeStyle();
} else {
return getLightThemeStyle();
}
} else if (theme.equals(DARK)) {
return getDarkThemeStyle(); return getDarkThemeStyle();
} else { } else {
return getLightThemeStyle(); return getLightThemeStyle();
@ -62,8 +54,21 @@ public class DynamicTheme {
return Build.VERSION.SDK_INT >= 29; return Build.VERSION.SDK_INT >= 29;
} }
private static boolean isSystemInDarkTheme(@NonNull Activity activity) { /**
return (activity.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES; * Takes the system theme into account.
*/
public static boolean isDarkTheme(@NonNull Context context) {
String theme = TextSecurePreferences.getTheme(context);
if (theme.equals(SYSTEM) && systemThemeAvailable()) {
return isSystemInDarkTheme(context);
} else {
return theme.equals(DARK);
}
}
private static boolean isSystemInDarkTheme(@NonNull Context context) {
return (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
} }
private static final class OverridePendingTransition { private static final class OverridePendingTransition {