Skip to content

Commit

Permalink
Merge branch 'master' into youngcw/goal_progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@youngcw
youngcw committed Nov 5, 2023
2 parents 1255fe6 + d8c885b commit f8d36a8
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 79 deletions.
Binary file modified ...s-snapshots/Mobile-checks-that-settings-page-can-be-opened-2-chromium-linux.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ettings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/desktop-client/src/components/budget/MobileBudget.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ class Budget extends Component {
onReorderGroup={this.onReorderGroup}
onOpenActionSheet={() => {}} //this.onOpenActionSheet}
onBudgetAction={applyBudgetAction}
onRefresh={onRefresh}
savePrefs={savePrefs}
/>
)}
Expand Down
156 changes: 80 additions & 76 deletions packages/desktop-client/src/components/budget/MobileBudgetTable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import Label from '../common/Label';
import Menu from '../common/Menu';
import Text from '../common/Text';
import View from '../common/View';
import PullToRefresh from '../responsive/PullToRefresh';
import { useServerURL } from '../ServerContext';
import CellValue from '../spreadsheet/CellValue';
import NamespaceContext from '../spreadsheet/NamespaceContext';
Expand Down Expand Up @@ -1526,6 +1527,7 @@ export function BudgetTable(props) {
onShowBudgetDetails,
// onOpenActionSheet,
onBudgetAction,
onRefresh,
savePrefs,
} = props;

Expand Down Expand Up @@ -1742,83 +1744,85 @@ export function BudgetTable(props) {
</View>
</View>
<View style={{ overflowY: 'auto' }}>
{!editMode ? (
// <ScrollView
// ref={el => (this.list = el)}
// keyboardShouldPersistTaps="always"
// refreshControl={refreshControl}
// style={{ backgroundColor: colors.n10 }}
// automaticallyAdjustContentInsets={false}
// >
<View>
<BudgetGroups
type={type}
categoryGroups={categoryGroups}
showBudgetedCol={showBudgetedCol}
show3Cols={show3Cols}
showHiddenCategories={showHiddenCategories}
// gestures={gestures}
month={month}
editMode={editMode}
editingGroupId={editingGroupId}
onEditGroup={onEditGroup}
editingCategoryId={editingCategoryId}
onEditCategory={onEditCategory}
editingBudgetCategoryId={editingBudgetCategoryId}
onEditCategoryBudget={onEditCategoryBudget}
openBudgetActionMenuId={openBudgetActionMenuId}
onOpenBudgetActionMenu={onOpenBudgetActionMenu}
onSaveCategory={onSaveCategory}
onDeleteCategory={onDeleteCategory}
onAddCategory={onAddCategory}
onAddGroup={onAddGroup}
onSaveGroup={onSaveGroup}
onDeleteGroup={onDeleteGroup}
onReorderCategory={onReorderCategory}
onReorderGroup={onReorderGroup}
onBudgetAction={onBudgetAction}
/>
</View>
) : (
// </ScrollView>
// <DragDrop>
// {({
// dragging,
// onGestureEvent,
// onHandlerStateChange,
// scrollRef,
// onScroll
// }) => (
<View>
<BudgetGroups
type={type}
categoryGroups={categoryGroups}
showBudgetedCol={showBudgetedCol}
show3Cols={show3Cols}
showHiddenCategories={showHiddenCategories}
// gestures={gestures}
editMode={editMode}
editingGroupId={editingGroupId}
onEditGroup={onEditGroup}
editingCategoryId={editingCategoryId}
onEditCategory={onEditCategory}
editingBudgetCategoryId={editingBudgetCategoryId}
onEditCategoryBudget={onEditCategoryBudget}
onSaveCategory={onSaveCategory}
onDeleteCategory={onDeleteCategory}
onAddCategory={onAddCategory}
onAddGroup={onAddGroup}
onSaveGroup={onSaveGroup}
onDeleteGroup={onDeleteGroup}
onReorderCategory={onReorderCategory}
onReorderGroup={onReorderGroup}
onBudgetAction={onBudgetAction}
/>
</View>
<PullToRefresh onRefresh={onRefresh}>
{!editMode ? (
// <ScrollView
// ref={el => (this.list = el)}
// keyboardShouldPersistTaps="always"
// refreshControl={refreshControl}
// style={{ backgroundColor: colors.n10 }}
// automaticallyAdjustContentInsets={false}
// >
<View>
<BudgetGroups
type={type}
categoryGroups={categoryGroups}
showBudgetedCol={showBudgetedCol}
show3Cols={show3Cols}
showHiddenCategories={showHiddenCategories}
// gestures={gestures}
month={month}
editMode={editMode}
editingGroupId={editingGroupId}
onEditGroup={onEditGroup}
editingCategoryId={editingCategoryId}
onEditCategory={onEditCategory}
editingBudgetCategoryId={editingBudgetCategoryId}
onEditCategoryBudget={onEditCategoryBudget}
openBudgetActionMenuId={openBudgetActionMenuId}
onOpenBudgetActionMenu={onOpenBudgetActionMenu}
onSaveCategory={onSaveCategory}
onDeleteCategory={onDeleteCategory}
onAddCategory={onAddCategory}
onAddGroup={onAddGroup}
onSaveGroup={onSaveGroup}
onDeleteGroup={onDeleteGroup}
onReorderCategory={onReorderCategory}
onReorderGroup={onReorderGroup}
onBudgetAction={onBudgetAction}
/>
</View>
) : (
// </ScrollView>
// <DragDrop>
// {({
// dragging,
// onGestureEvent,
// onHandlerStateChange,
// scrollRef,
// onScroll
// }) => (
<View>
<BudgetGroups
type={type}
categoryGroups={categoryGroups}
showBudgetedCol={showBudgetedCol}
show3Cols={show3Cols}
showHiddenCategories={showHiddenCategories}
// gestures={gestures}
editMode={editMode}
editingGroupId={editingGroupId}
onEditGroup={onEditGroup}
editingCategoryId={editingCategoryId}
onEditCategory={onEditCategory}
editingBudgetCategoryId={editingBudgetCategoryId}
onEditCategoryBudget={onEditCategoryBudget}
onSaveCategory={onSaveCategory}
onDeleteCategory={onDeleteCategory}
onAddCategory={onAddCategory}
onAddGroup={onAddGroup}
onSaveGroup={onSaveGroup}
onDeleteGroup={onDeleteGroup}
onReorderCategory={onReorderCategory}
onReorderGroup={onReorderGroup}
onBudgetAction={onBudgetAction}
/>
</View>

// <DragDropHighlight />
// </DragDrop>
)}
// <DragDropHighlight />
// </DragDrop>
)}
</PullToRefresh>
</View>
</View>
</NamespaceContext.Provider>
Expand Down
5 changes: 4 additions & 1 deletion packages/desktop-client/src/components/settings/Encryption.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ export default function EncryptionSettings() {
<strong>End-to-end encryption</strong> is not available when running
without a server. Budget files are always kept unencrypted locally, and
encryption is only applied when sending data to a server.{' '}
<ExternalLink to="https://actualbudget.org/docs/getting-started/sync/#end-to-end-encryption">
<ExternalLink
to="https://actualbudget.org/docs/getting-started/sync/#end-to-end-encryption"
linkColor="purple"
>
Learn more…
</ExternalLink>
</Text>
Expand Down
5 changes: 4 additions & 1 deletion packages/desktop-client/src/components/settings/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ function About() {
</Text>
)}
<Text>
<ExternalLink to="https://actualbudget.org/docs/releases">
<ExternalLink
to="https://actualbudget.org/docs/releases"
linkColor="purple"
>
Release Notes
</ExternalLink>
</Text>
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-client/src/style/themes/dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export const formInputShadowSelected = colorPalette.purple200;
export const altFormInputShadowSelected = formInputShadowSelected;
export const formInputTextHighlight = colorPalette.purple400;

export const pillBackground = colorPalette.navy600;
export const pillBackground = colorPalette.navy800;
export const pillText = colorPalette.navy200;
export const pillTextHighlighted = colorPalette.purple500;
export const pillBorder = colorPalette.navy700;
Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/1765.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Bugfix
authors: [Evomatic]
---

Dark mode - darker tint for pageTextLink.
6 changes: 6 additions & 0 deletions upcoming-release-notes/1858.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Enhancements
authors: [joel-jeremy]
---

Mobile budget pull down to sync.

0 comments on commit f8d36a8

Please sign in to comment.