Skip to content

Commit d1550d3

Browse files
committed
updating for Android 15 (sdk 35) compatibility
1 parent 175490c commit d1550d3

File tree

9 files changed

+472
-7
lines changed

9 files changed

+472
-7
lines changed

Simplenote/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ android {
4141
versionCode versionProperties.getProperty("versionCode").toInteger()
4242

4343
minSdkVersion 23
44-
targetSdkVersion 34
44+
targetSdkVersion 35
4545

4646
testInstrumentationRunner 'com.automattic.simplenote.SimplenoteAppRunner'
4747
}

Simplenote/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@
164164
android:name="com.automattic.simplenote.PreferencesActivity"
165165
android:configChanges="orientation|keyboardHidden|screenSize"
166166
android:label="Preferences"
167-
android:parentActivityName=".NotesActivity">
167+
android:parentActivityName=".NotesActivity"
168+
android:theme="@style/Theme.Simplestyle">
168169
</activity>
169170

170171
<activity

Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
import com.automattic.simplenote.utils.TagsMultiAutoCompleteTextView;
8383
import com.automattic.simplenote.utils.TagsMultiAutoCompleteTextView.OnTagAddedListener;
8484
import com.automattic.simplenote.utils.TextHighlighter;
85+
import com.automattic.simplenote.utils.SystemBarUtils;
8586
import com.automattic.simplenote.utils.ThemeUtils;
8687
import com.automattic.simplenote.utils.WidgetUtils;
8788
import com.automattic.simplenote.viewmodels.NoteEditorViewModel;
@@ -204,7 +205,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
204205
DrawableUtils.tintMenuWithAttribute(getActivity(), menu, R.attr.toolbarIconColor);
205206
}
206207

207-
requireActivity().getWindow().setStatusBarColor(ThemeUtils.getColorFromAttribute(requireContext(), R.attr.mainBackgroundColor));
208+
SystemBarUtils.setStatusBarColor(requireActivity(), ThemeUtils.getColorFromAttribute(requireContext(), R.attr.mainBackgroundColor));
208209
return true;
209210
}
210211

@@ -279,7 +280,7 @@ public void onDestroyActionMode(ActionMode mode) {
279280
}
280281

281282
new Handler().postDelayed(
282-
() -> requireActivity().getWindow().setStatusBarColor(
283+
() -> SystemBarUtils.setStatusBarColor(requireActivity(),
283284
getResources().getColor(android.R.color.transparent, requireActivity().getTheme())),
284285
requireContext().getResources().getInteger(android.R.integer.config_mediumAnimTime)
285286
);

Simplenote/src/main/java/com/automattic/simplenote/NoteListFragment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
import com.automattic.simplenote.utils.SimplenoteLinkify;
8181
import com.automattic.simplenote.utils.StrUtils;
8282
import com.automattic.simplenote.utils.TextHighlighter;
83+
import com.automattic.simplenote.utils.SystemBarUtils;
8384
import com.automattic.simplenote.utils.ThemeUtils;
8485
import com.automattic.simplenote.utils.WidgetUtils;
8586
import com.automattic.simplenote.widgets.RobotoRegularTextView;
@@ -193,7 +194,7 @@ public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
193194
inflater.inflate(R.menu.bulk_edit, menu);
194195
DrawableUtils.tintMenuWithAttribute(getActivity(), menu, R.attr.actionModeTextColor);
195196
mActionMode = actionMode;
196-
requireActivity().getWindow().setStatusBarColor(ThemeUtils.getColorFromAttribute(requireContext(), R.attr.mainBackgroundColor));
197+
SystemBarUtils.setStatusBarColor(requireActivity(), ThemeUtils.getColorFromAttribute(requireContext(), R.attr.mainBackgroundColor));
197198
return true;
198199
}
199200

@@ -304,7 +305,7 @@ public void onDestroyActionMode(ActionMode mode) {
304305
new Runnable() {
305306
@Override
306307
public void run() {
307-
requireActivity().getWindow().setStatusBarColor(getResources().getColor(android.R.color.transparent, requireActivity().getTheme()));
308+
SystemBarUtils.setStatusBarColor(requireActivity(), getResources().getColor(android.R.color.transparent, requireActivity().getTheme()));
308309
}
309310
},
310311
requireContext().getResources().getInteger(android.R.integer.config_longAnimTime)

Simplenote/src/main/java/com/automattic/simplenote/PreferencesActivity.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
import android.os.Bundle;
44
import android.view.View;
5+
import android.view.ViewGroup;
56
import android.widget.Toast;
67

78
import androidx.appcompat.widget.Toolbar;
89
import androidx.fragment.app.FragmentManager;
910
import androidx.preference.Preference;
1011

1112
import com.automattic.simplenote.utils.BrowserUtils;
13+
import com.automattic.simplenote.utils.SystemBarUtils;
1214

1315
import org.wordpress.passcodelock.PasscodePreferenceFragment;
1416
import org.wordpress.passcodelock.PasscodePreferenceFragmentCompat;
@@ -56,6 +58,14 @@ protected void onCreate(Bundle savedInstanceState) {
5658
mPreferencesFragment = (PreferencesFragment) fragmentManager.findFragmentByTag(preferencesTag);
5759
mPasscodePreferenceFragment = (PasscodePreferenceFragmentCompat) fragmentManager.findFragmentByTag(passcodeTag);
5860
}
61+
62+
// Setup edge-to-edge display with proper WindowInsets handling
63+
SystemBarUtils.setupEdgeToEdgeWithToolbar(
64+
this,
65+
findViewById(R.id.main_parent_view),
66+
toolbar,
67+
findViewById(R.id.preferences_container)
68+
);
5969
}
6070

6171
@Override

0 commit comments

Comments
 (0)