Skip to content

Commit 72dadc4

Browse files
committed
Fix settings crash, Color/White theme fixes Settings, ActionOrder, ShareInto - by @gsantner
1 parent f132d52 commit 72dadc4

File tree

5 files changed

+6
-0
lines changed

5 files changed

+6
-0
lines changed

app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public static class RESULT {
5858

5959
protected Toolbar toolbar;
6060

61+
@Override
6162
public void onCreate(Bundle b) {
6263
// Must be applied before setContentView
6364
super.onCreate(b);

app/src/main/java/net/gsantner/opoc/frontend/base/GsPreferenceFragmentBase.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ private synchronized void updatePreferenceChangedListeners(boolean shouldListen)
266266
@Override
267267
public void onResume() {
268268
super.onResume();
269+
_appSettings = getAppSettings(getActivity());
270+
_cu = GsContextUtils.instance;
269271
updatePreferenceChangedListeners(true);
270272
doUpdatePreferences(); // Invoked later
271273
onPreferenceScreenChangedPriv(this, getPreferenceScreen());

app/src/main/res/layout/action_order_activity.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7+
android:background="@color/background"
78
android:orientation="vertical"
89
tools:context=".activity.ActionButtonSettingsActivity">
910

app/src/main/res/layout/document__activity.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
xmlns:tools="http://schemas.android.com/tools"
1414
android:layout_width="match_parent"
1515
android:layout_height="match_parent"
16+
android:background="@color/background"
1617
android:orientation="vertical"
1718
android:theme="@style/AppTheme.Unified"
1819
tools:context="net.gsantner.markor.activity.DocumentActivity">

app/src/main/res/layout/settings__activity.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
xmlns:tools="http://schemas.android.com/tools"
1414
android:layout_width="match_parent"
1515
android:layout_height="match_parent"
16+
android:background="@color/background"
1617
android:theme="@style/AppTheme.Unified"
1718
tools:context="net.gsantner.markor.activity.DocumentActivity">
1819

0 commit comments

Comments
 (0)