Theme hierarchy refactoring.

Force dark theme for media send activity.
This commit is contained in:
Anton Chekulaev
2020-08-25 19:43:00 +10:00
parent b04028f629
commit 810afe8e7e
12 changed files with 102 additions and 70 deletions

View File

@@ -32,7 +32,6 @@ import java.util.Date;
import network.loki.messenger.R;
public abstract class BaseActionBarActivity extends AppCompatActivity {
private static final String TAG = BaseActionBarActivity.class.getSimpleName();
private BroadcastReceiver broadcastReceiver;

View File

@@ -129,8 +129,9 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
@Override
public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
return ThemeUtil.getThemedInflater(requireActivity(), inflater, R.style.TextSecure_DarkTheme)
.inflate(R.layout.mediasend_fragment, container, false);
// return ThemeUtil.getThemedInflater(requireActivity(), inflater, R.style.TextSecure_DarkTheme)
// .inflate(R.layout.mediasend_fragment, container, false);
return inflater.inflate(R.layout.mediasend_fragment, container, false);
}
@Override

View File

@@ -7,6 +7,6 @@ import network.loki.messenger.R;
public class DynamicNoActionBarTheme extends DynamicTheme {
@Override
protected int getSelectedTheme(Activity activity) {
return R.style.TextSecure_DarkNoActionBar;
return R.style.Theme_TextSecure_DayNight_NoActionBar;
}
}

View File

@@ -28,7 +28,8 @@ public class DynamicTheme {
}
protected int getSelectedTheme(Activity activity) {
return R.style.TextSecure_DarkTheme;
// For all legacy (Signal) activities we lock on to the Signal dedicated theme.
return R.style.Theme_TextSecure_DayNight;
}
private static final class OverridePendingTransition {