Commit Graph

864 Commits

Author SHA1 Message Date
Abdelilah El Aissaoui
7449bdf446 Fixed clone button and added settings option 2022-10-27 20:29:35 +02:00
Abdelilah El Aissaoui
c4ce272359 / before file is always shown even if the path is being cut 2022-10-27 20:20:39 +02:00
Abdelilah El Aissaoui
315387fafc Added error message when revert commit or start rebase interactive have failed 2022-10-27 20:19:50 +02:00
Abdelilah El Aissaoui
b4c304371c Improved menu bar 2022-10-27 20:05:45 +02:00
Abdelilah El Aissaoui
bf6afc82c6 Fixed clicking on a log line being unresponsive
Happens when having 2 repositories with commits in common (same SHA). Instead of making fast clickable being based only on the hash, take also in consideration the viewmodel to differentiate between tabs
2022-10-27 20:05:27 +02:00
Abdelilah El Aissaoui
1d98491f71 Changed menu UI 2022-10-27 17:23:12 +02:00
Abdelilah El Aissaoui
94be23b872 Fixed uncommited changes line not refreshing in log changed "open repo" string 2022-10-27 13:04:02 +02:00
Abdelilah El Aissaoui
4196319203 Changed settings button design 2022-10-27 13:03:06 +02:00
Abdelilah El Aissaoui
1847eb42e9 Reduced size of buttons in menu 2022-10-25 19:56:55 +02:00
Abdelilah El Aissaoui
f2412616af Fixed multiline text field in rebase interactive 2022-10-25 19:56:23 +02:00
Abdelilah El Aissaoui
d934b83c4e Fixed rebase interactive layout 2022-10-24 17:57:46 +02:00
Abdelilah El Aissaoui
5d7d1d6f8b Removed use of keys in graph commits list 2022-10-23 18:05:20 +02:00
Abdelilah El Aissaoui
2e0e616dc2 Fixed uncommited changes graph line not being drawn when having conflicts 2022-10-23 18:01:23 +02:00
Abdelilah El Aissaoui
90a516f5af Added hint to quick actions dialog 2022-10-23 17:35:19 +02:00
Abdelilah El Aissaoui
302376a23e Fixed edit remotes dialog buttons 2022-10-23 16:15:30 +02:00
Abdelilah El Aissaoui
a0383b2781 Fixed commits limit toggle not working 2022-10-23 02:39:46 +02:00
Abdelilah El Aissaoui
4944c7c23c Adjusted search dir button height in clone dialog 2022-10-23 02:10:40 +02:00
Abdelilah El Aissaoui
27b9416598 Replaced side bar 2022-10-23 01:41:04 +02:00
Abdelilah El Aissaoui
47d1e89af2 Renamed colors properties 2022-10-22 22:19:37 +02:00
Abdelilah El Aissaoui
44774c2635 Increased diff header font weight 2022-10-22 20:40:07 +02:00
Abdelilah El Aissaoui
28c7ef0ac8 Changed extended menu button separator design 2022-10-22 15:53:56 +02:00
Abdelilah El Aissaoui
039b6b2f76 Fixed diff header using wrong spacing when file path is shown 2022-10-22 15:51:06 +02:00
Abdelilah El Aissaoui
f0ef6da660 Reformated whole project 2022-10-22 15:35:32 +02:00
Abdelilah El Aissaoui
87ec5e8f65 Changed "reset" string to "discard file changes" 2022-10-22 15:28:39 +02:00
Abdelilah El Aissaoui
34652ecc07 Added end padding to files changes 2022-10-22 15:28:39 +02:00
Abdelilah El Aissaoui
03a52cb4ce Removed submodules component 2022-10-22 15:28:39 +02:00
Abdelilah El Aissaoui
3ff18edaad Diff header now shrinks path to fit other ui elements if needed (like changed files in a commit) 2022-10-22 01:38:23 +02:00
Abdelilah El Aissaoui
096f4128b2 Fixed filename being cut in uncommited/commit changes 2022-10-22 01:15:54 +02:00
Abdelilah El Aissaoui
3554c7ebcf Code cleanup 2022-10-22 01:12:48 +02:00
Abdelilah El Aissaoui
d5e831b3bf Reduced min size of commit changes & side panel components while adding default percentage 2022-10-21 22:03:18 +02:00
Abdelilah El Aissaoui
b68461fb95 Changed dark theme primary color to a darker shade 2022-10-21 22:02:37 +02:00
Abdelilah El Aissaoui
c8d8c162a2 Adjusted commit changes design 2022-10-21 22:02:19 +02:00
Abdelilah El Aissaoui
f517f62426 Increased graph line width 2022-10-21 18:47:24 +02:00
Abdelilah El Aissaoui
d69bdb260d Fixed scrolling to a tag/branch not working as expected 2022-10-21 18:47:16 +02:00
Abdelilah El Aissaoui
a65b990a49 Fixed fetch not working for newly added remotes 2022-10-21 18:35:13 +02:00
Abdelilah El Aissaoui
6d6cf3ffda Changed stash with message design 2022-10-19 23:35:56 +02:00
Abdelilah El Aissaoui
0d5c83d92f Adjusted light theme colors 2022-10-19 23:24:02 +02:00
Abdelilah El Aissaoui
b2812648d3 Fixed welcome page buttons colors in light theme 2022-10-19 23:22:12 +02:00
Abdelilah El Aissaoui
fdbf92083a Tabs now can be scrolled with a scrollbar or shift+mouse wheel 2022-10-19 23:16:22 +02:00
Abdelilah El Aissaoui
325420bf47 Limited top menu buttons lines to 1 2022-10-19 22:21:03 +02:00
Abdelilah El Aissaoui
438bea4788 Changed design of uncommited changes 2022-10-18 23:47:18 +02:00
Abdelilah El Aissaoui
ad1cdb884b Fixed grammar error 2022-10-18 23:28:07 +02:00
Abdelilah El Aissaoui
2162191fe0 Fixed stashes list not being updated when stashing/drop stashes 2022-10-18 23:22:16 +02:00
Abdelilah El Aissaoui
6d2fadb437 Changed commit changes design 2022-10-18 23:12:30 +02:00
Abdelilah El Aissaoui
eebf16f707 Removed unnecessary logging 2022-10-18 22:45:02 +02:00
Abdelilah El Aissaoui
095c451aa4 Reduced font size by 1 dp 2022-10-18 22:40:42 +02:00
Abdelilah El Aissaoui
fceb559661 Added fixed size to image diff 2022-10-17 19:07:02 +02:00
Abdelilah El Aissaoui
40e9b042e5 Fixed flows being cancelled if component refresh failed 2022-10-17 10:32:44 +02:00
Abdelilah El Aissaoui
f293e9428c Improved events notifications. Removed GIt dir changes detection temporarily 2022-10-16 16:00:42 +02:00
Abdelilah El Aissaoui
453df1b6d4 Started refactor to remove nested ViewModels 2022-10-16 02:17:37 +02:00
Abdelilah El Aissaoui
578f30b7c9 Replaced custom clipboard method by the built-in 2022-10-15 19:06:12 +02:00
Abdelilah El Aissaoui
7203ee162b Disabled keyboard events during processing screen 2022-10-15 18:38:03 +02:00
Abdelilah El Aissaoui
5ba57f58b6 Increased number of recent repositories to 10 2022-10-15 18:15:20 +02:00
Abdelilah El Aissaoui
38a1b60e91 Fixed message-only amend would not be allowed 2022-10-15 18:11:01 +02:00
Abdelilah El Aissaoui
3be15ddc0c Revert "Divider will not be shown for the last file changed"
This reverts commit 65fbab2bd8.
2022-10-15 18:00:29 +02:00
Abdelilah El Aissaoui
17a285fcb4 Changed processing to be full screen 2022-10-15 17:54:17 +02:00
Abdelilah El Aissaoui
8ebcc10dde Started addition of "Quick actions" dialog 2022-10-15 01:18:52 +02:00
Abdelilah El Aissaoui
7fd3c1fdc2 Reduced log header height to match other headers 2022-10-15 00:31:54 +02:00
Abdelilah El Aissaoui
ff3adee916 Unified buttons styles 2022-10-15 00:27:15 +02:00
Abdelilah El Aissaoui
65fbab2bd8 Divider will not be shown for the last file changed 2022-10-14 23:44:38 +02:00
Abdelilah El Aissaoui
0f70c9a8cc Open "uncommited changes" by default 2022-10-14 23:44:01 +02:00
Abdelilah El Aissaoui
eaf8a52cd7 Redesigned tag dialog 2022-10-13 00:02:28 +02:00
Abdelilah El Aissaoui
1cf9cb5367 Added unstage by line feature 2022-10-11 13:17:25 +02:00
Abdelilah El Aissaoui
4f019ca8ed Fixed fast clickable for lists & added hover effect to it 2022-10-10 18:01:06 +02:00
Abdelilah El Aissaoui
add5666d89 Fixed unstage hunk regression in commit 3b1486e 2022-10-10 18:00:32 +02:00
Abdelilah El Aissaoui
eafebd2221 Added option to stage by line individually 2022-10-09 23:44:50 +02:00
Abdelilah El Aissaoui
871264722a Removed unnecessary log 2022-10-09 23:14:09 +02:00
Abdelilah El Aissaoui
5eada2e2a6 Replaced compose clickable modifier with custom pointerInput implementation
Should improve scrolling performance greatly while this issue still persists https://issuetracker.google.com/issues/228995735
2022-10-09 20:57:12 +02:00
Abdelilah El Aissaoui
9109f179df Added explanatory message for unsupported "manager-core" 2022-10-08 20:04:25 +02:00
Abdelilah El Aissaoui
7bdc2c4cf5 Added support for external git credentials helper [BETA]
Fixes https://github.com/JetpackDuba/Gitnuro/issues/16
2022-10-08 19:43:23 +02:00
Abdelilah El Aissaoui
c597624354 Replaced object with dagger singleton 2022-10-08 15:37:43 +02:00
Abdelilah El Aissaoui
21e1513d20 Redesigned reset branch dialog 2022-10-08 01:28:48 +02:00
Abdelilah El Aissaoui
e3c2a319ed Removed unnecessary logging 2022-10-08 01:26:47 +02:00
Abdelilah El Aissaoui
c2ebd0a038 Moved refresh button to bottom of side menu 2022-10-06 22:13:40 +02:00
Abdelilah El Aissaoui
9971e410db Added new branch dialog design & fixed fonts colors 2022-10-06 22:09:35 +02:00
Abdelilah El Aissaoui
76b3526aed Replaced primaryTextColor with onBackground & added new ssh pwd dialog 2022-10-06 21:56:24 +02:00
Abdelilah El Aissaoui
08536b2caa Removed scroll to top in favor of workspace button 2022-10-05 21:27:55 +02:00
Abdelilah El Aissaoui
2ffb8d9038 Added new side bar 2022-10-05 18:56:13 +02:00
Abdelilah El Aissaoui
e0bdc52409 Close tab button is hidden if the tab is not selected or hovered 2022-10-03 22:29:25 +02:00
Abdelilah El Aissaoui
fad8a2779e Changed tabs' design 2022-10-03 20:09:52 +02:00
Abdelilah El Aissaoui
87a701b4a5 Changed top menu design 2022-10-03 19:44:47 +02:00
Abdelilah El Aissaoui
3d5bc35c07 Added new side menu 2022-10-02 23:30:07 +02:00
Abdelilah El Aissaoui
125329a3aa Removed unnecessary logging 2022-10-02 23:28:35 +02:00
Abdelilah El Aissaoui
65f48a70b4 Adjusted themes colors 2022-10-02 23:28:21 +02:00
Abdelilah El Aissaoui
527d78229e Added support for GIFs & animated WebP
Fixes #2
2022-10-02 23:27:52 +02:00
Abdelilah El Aissaoui
115a195a61 Improved design of Settings dialog 2022-10-02 04:04:20 +02:00
Abdelilah El Aissaoui
1e0f54cd36 Fixed bug where enter key would trigger pull/push operations if a dialog was shown 2022-09-30 14:48:23 +02:00
Abdelilah El Aissaoui
acb5d07479 Added file history icon 2022-09-29 17:50:26 +02:00
Abdelilah El Aissaoui
876a3265fe Adjusted dialog colors to use surface color 2022-09-29 17:48:47 +02:00
Abdelilah El Aissaoui
bfeaf717b7 Improved light theme and removed unused property 2022-09-29 10:14:51 +02:00
Abdelilah El Aissaoui
8c3e11ef38 Fixed crash when resetting uncommited file 2022-09-29 10:13:55 +02:00
Abdelilah El Aissaoui
e7c36c6e90 Created custom implementation of context menu and added new icons 2022-09-28 15:08:17 +02:00
Abdelilah El Aissaoui
8df62ef2b7 Moved classes to match the package name 2022-09-28 01:56:21 +02:00
Abdelilah El Aissaoui
b7ece2e051 Added submodules init option 2022-09-22 13:10:46 +02:00
Abdelilah El Aissaoui
fd98fcfd05 Fixed "stage" and "unstage" not showing an error if failed 2022-09-09 22:26:48 +02:00
Abdelilah El Aissaoui
4c6b45537b Increased clone dialog height 2022-09-09 22:26:26 +02:00
Abdelilah El Aissaoui
1217d401ed Added submodules listing support 2022-09-06 02:36:15 +02:00
Abdelilah El Aissaoui
7cc3c069b6 Improved clone dialog UI 2022-09-06 02:35:58 +02:00
Abdelilah El Aissaoui
29418a0dbc Updated readme 2022-09-06 02:08:24 +02:00
Abdelilah El Aissaoui
d2608f8f60 Changed clone dialog design and improved text field behavior with long text 2022-09-03 18:30:26 +02:00
Abdelilah El Aissaoui
7148e59eeb Removed repository & remotes managers in favor of use cases 2022-09-03 17:15:44 +02:00
Abdelilah El Aissaoui
32b2c1df11 Removed tag & rebase managers in favor of use cases 2022-08-30 05:05:57 +02:00
Abdelilah El Aissaoui
4e387951e1 Removed log manager in favor of use casess 2022-08-27 04:01:26 +02:00
Abdelilah El Aissaoui
7b1ce8b17a Removed stash manager in favor of use casess 2022-08-26 05:46:03 +02:00
Abdelilah El Aissaoui
3b1486efb6 Refactored status manager into use cases 2022-08-26 05:35:58 +02:00
Abdelilah El Aissaoui
d3f2b4a23f Removed diff manager in favor of use cases
Also simplified hunk generator and raw file manager
2022-08-24 05:17:18 +02:00
Abdelilah El Aissaoui
270951fe66 Started arch refactor 2022-08-24 04:43:31 +02:00
Abdelilah El Aissaoui
cbcb13d730 Fixed text selection when using split diff 2022-08-24 04:43:05 +02:00
Abdelilah El Aissaoui
81261e42c7 Moved generate split hunk use case 2022-08-24 03:26:11 +02:00
Abdelilah El Aissaoui
d76fb85373 Updated compose to 1.2.0-alpha01-dev755 2022-08-22 20:42:15 +02:00
Abdelilah El Aissaoui
07502a1ce2 Removed background from diff number 2022-08-21 03:04:50 +02:00
Abdelilah El Aissaoui
efcfce0f18 Refactored split diff to fix issues
Added new test case
2022-08-21 01:57:58 +02:00
Abdelilah El Aissaoui
ef6e6d7d69 Increased version to 1.1.0 2022-08-16 14:17:48 +02:00
Abdelilah El Aissaoui
7506c79b63 Simplified split hunk generation & added to file history diff 2022-08-15 03:52:36 +02:00
Abdelilah El Aissaoui
e550a6289c Clicking an image diff will now open ir with the default image viewer 2022-08-14 20:26:42 +02:00
Abdelilah El Aissaoui
5659bf8918 Added basic split diff 2022-08-14 20:25:51 +02:00
Abdelilah El Aissaoui
c04fc09247 Unified OS checking calls 2022-08-07 17:37:08 +02:00
Abdelilah El Aissaoui
8e65bff8e9 Replaced java calls for dialogs by native OS calls 2022-08-07 17:24:48 +02:00
Abdelilah El Aissaoui
975b0730d9 Fixed color scheme for light theme 2022-08-07 17:24:21 +02:00
Abdelilah El Aissaoui
4de4c5f76a Increased version to 1.0.1 2022-08-07 16:41:41 +02:00
Abdelilah El Aissaoui
71265998dc Fixed settings entry padding 2022-08-06 21:23:00 +02:00
Abdelilah El Aissaoui
74f4d22856 Removed unnecessary opt-in annotations 2022-08-06 21:06:36 +02:00
Abdelilah El Aissaoui
2e839a284f Fixed enter not working to accept tag name 2022-08-06 21:06:22 +02:00
Abdelilah El Aissaoui
00d95b6feb Project code cleanup 2022-08-06 21:03:45 +02:00
Abdelilah El Aissaoui
8db0313eb9 Increased default graph width & now graph width is saved across tabs 2022-08-06 04:03:24 +02:00
Abdelilah El Aissaoui
dc31181387 Improved avatar loading
Now avatar loading checks first if there is a cached avatar and before showing the placeholder, to avoid showing the placeholder for a moment when a cached version is available.

This will reduce CPU usage by a tiny bit since the placeholder won't have to be rendered.
2022-08-06 03:46:09 +02:00
Abdelilah El Aissaoui
20e23a9750 Fixed inverted colors of scrollbars 2022-08-06 03:22:54 +02:00
Abdelilah El Aissaoui
3c5b8f7ae6 Fixed multiple lines shown in changed lines
Also fixed copying not copying line endings of unchanged lines
2022-08-06 03:07:32 +02:00
Abdelilah El Aissaoui
6398244895 Reduced titles sizes and limited secondary button lines to 1 2022-08-06 02:26:30 +02:00
Abdelilah El Aissaoui
914edc9aa7 Removed decimals from calculated scale 2022-08-06 02:14:19 +02:00
Abdelilah El Aissaoui
ef384007d3 Fixed diff lines being cut 2022-08-05 01:51:53 +02:00
Abdelilah El Aissaoui
b950dc13fc Reduced tab title font size 2022-08-05 01:34:45 +02:00
Abdelilah El Aissaoui
d7a728c684 Text box label changed when rebasing to remark it as read only 2022-08-05 00:00:22 +02:00
Abdelilah El Aissaoui
b9fff2dc43 Remote edit dialog UI improved 2022-08-04 23:59:58 +02:00
Abdelilah El Aissaoui
7f42548b53 Fixed settings dialog title paddings 2022-08-04 23:59:27 +02:00
Abdelilah El Aissaoui
f0a4fd379f Added option to have a scale different than the ones predefined 2022-08-04 15:11:45 +02:00
Abdelilah El Aissaoui
83e0030b1c Changed scale slider to dropdown 2022-08-04 02:50:07 +02:00
Abdelilah El Aissaoui
884d5f1aa4 Changed switch toggle color when unchecked 2022-08-04 02:30:38 +02:00
Abdelilah El Aissaoui
491ed8e5c4 Fixed "Discard changes" button colors 2022-08-04 02:30:21 +02:00
Abdelilah El Aissaoui
3de4339860 Fixed colors scheme of remotes and settings dialogs 2022-08-04 00:52:19 +02:00
Abdelilah El Aissaoui
d5359effb6 Added management state when the repository is in "reverting" state 2022-08-04 00:39:11 +02:00
Abdelilah El Aissaoui
591fa98508 Added scaling setting 2022-08-04 00:38:46 +02:00
Abdelilah El Aissaoui
02906a253d Implemented keybinding management
This feature allows to easily add new keybindings (programmatically) to features accross the app.

Should also fix the issue that https://github.com/JetpackDuba/Gitnuro/pull/13 tried to solve
2022-07-22 20:34:36 +02:00
Abdelilah El Aissaoui
57e8482218 Added option to copy git ID to clipboard 2022-07-20 12:08:30 +02:00
Abdelilah El Aissaoui
fe77505e7d Reduced font size for commit message and fixed issue in settings dialog when switching between themes 2022-07-14 22:32:13 +02:00
Abdelilah El Aissaoui
7164bd3e71 Increased font units by 1 for the smallest text 2022-07-10 19:50:03 +02:00
Abdelilah El Aissaoui
1221085374 Graph separator takes in consideration screen density 2022-07-10 16:21:25 +02:00
Abdelilah El Aissaoui
e28033f951 Reduced size of message box label 2022-07-10 16:19:03 +02:00
Abdelilah El Aissaoui
d6a8b93026 Removed mutex from tab state
Workaround to make rebase interactive work again as it runs simultaneous operations
2022-07-10 16:18:25 +02:00
Abdelilah El Aissaoui
d93e634a5c Unified fonts styles 2022-07-10 16:04:03 +02:00
Abdelilah El Aissaoui
4c48cd995e Implemented manual refresh with F5 2022-06-27 20:36:24 +02:00
Abdelilah El Aissaoui
0f835edc35 Current branch now shows HEAD instead of a dot and bold text
This and the previous commit fix the scroll overlap of https://github.com/JetpackDuba/Gitnuro/issues/12
2022-06-27 19:32:28 +02:00
Abdelilah El Aissaoui
4ef18cf84b Increased items count padding in left panel to match the scrollbar 2022-06-27 19:21:40 +02:00
Abdelilah El Aissaoui
6599f2f861 Side panel now is a single big list with local branches and stashes expanded by default 2022-06-26 18:46:48 +02:00
Abdelilah El Aissaoui
64764c556d Changed app version to 1.0.0 2022-06-25 04:47:53 +02:00
Abdelilah El Aissaoui
42e6b32ba3 Fixed tag button being disabled when setting a name 2022-06-24 19:59:03 +02:00
Abdelilah El Aissaoui
befc7d1740 Removed merge dialog. Fast forward config is now in the settings 2022-06-24 19:42:01 +02:00
Abdelilah El Aissaoui
7ce311d9b5 Fixed commit message being shared between tabs 2022-06-24 01:58:46 +02:00
Abdelilah El Aissaoui
5c879961ac Removed rebase dialog 2022-06-24 01:58:29 +02:00
Abdelilah El Aissaoui
cbedb0e82c Unified components from settings and changed subtitle to secondary color 2022-06-23 22:30:11 +02:00
Abdelilah El Aissaoui
32fae01e6e Improved rebase interactive design 2022-06-23 19:28:21 +02:00
Abdelilah El Aissaoui
17c0f50360 Fixed graph not refreshing branches when branch checkout failed after creation 2022-06-23 14:46:37 +02:00
Abdelilah El Aissaoui
0186a3ac90 Implemented rebase interactive resuming 2022-06-23 14:04:38 +02:00
Abdelilah El Aissaoui
6501a9c98e Reduced icon's size of "Scroll to top" button 2022-06-23 13:42:32 +02:00
Abdelilah El Aissaoui
8d6df8a9e0 Added color around dialogs to improve contrast 2022-06-23 13:32:07 +02:00
Abdelilah El Aissaoui
6a44e8f958 Multiple UI improvements
- Added custom resizable outlined text field.
- Reduced size of "scroll to top" button text
2022-06-23 13:20:46 +02:00
Abdelilah El Aissaoui
2975059bd2 Graph horizontal scroll state is preserved when changing between tabs 2022-06-23 10:35:47 +02:00
Abdelilah El Aissaoui
02e37583f9 Added scroll to top button in the log 2022-06-23 10:24:58 +02:00
Abdelilah El Aissaoui
a86d1f7c1b Added option to abort cherry-pick.
Uncommited changes line will be shown now even when the status is empty if the repo is rebasing, merging or cherry-picking. This will allow the user to abort the operation if required.
2022-06-23 09:46:26 +02:00
Abdelilah El Aissaoui
765d0e9d96 Fixed cherry-pick not refreshing status.
Required when the cherry-pick has conflicts.
2022-06-22 18:42:38 +02:00
Abdelilah El Aissaoui
f1c8036342 Increased paddings in author dialog 2022-06-22 10:58:29 +02:00
Abdelilah El Aissaoui
1f889aca1c Fixed reset on conflicted files 2022-06-22 10:40:41 +02:00
Abdelilah El Aissaoui
ab8e8c7dbe Added dialog to edit author info 2022-06-22 00:53:10 +02:00
Abdelilah El Aissaoui
43330eb3c4 Added option to load custom themes.
Fixes https://github.com/JetpackDuba/Gitnuro/issues/3
2022-06-19 22:49:41 +02:00
Abdelilah El Aissaoui
15827d119a Added option to discard hunks 2022-06-19 19:52:53 +02:00
Abdelilah El Aissaoui
1835ff748d Added new tooltip component 2022-06-19 16:36:40 +02:00
Abdelilah El Aissaoui
55ebd9ee0d Removed no longer valid TODOs 2022-06-19 16:35:09 +02:00
Abdelilah El Aissaoui
3bea4f22e8 Added bottom status bar 2022-06-19 16:10:57 +02:00
Abdelilah El Aissaoui
ca32f7c551 Fixed padding of merge/rebase buttons when having conflicts 2022-06-17 17:47:25 +02:00
Abdelilah El Aissaoui
86a7f85e74 Rebase conflict now shows current commit message as read-only 2022-06-17 17:45:18 +02:00
Abdelilah El Aissaoui
dc45551259 Fixed uncommited changes node size on density > 1 2022-06-17 14:08:21 +02:00
Abdelilah El Aissaoui
656ac42d17 Fixed diff inconsistencies and cleared diffViewModel when not used
Weird bug where clicking on an entry to diff after staging a file that was being displayed would end up in the diff being completly closed. Clearing the previous viewmodel from memory fixes the issue.
2022-06-17 04:19:47 +02:00
Abdelilah El Aissaoui
a43c13462a The app now remembers the window state.
The resolution won't be saved to avoid issues when adding or removing screens with different resolution.

Fixes https://github.com/JetpackDuba/Gitnuro/issues/8
2022-06-17 03:14:21 +02:00
Abdelilah El Aissaoui
d79095533d Added option to delete remote branch from log 2022-06-11 23:54:43 +02:00
Abdelilah El Aissaoui
27d28cfdce OnClick is now null on default for SideMenuSubentry.
Implementing an empty callback would break the behavior of the VerticalExpandable.
2022-06-11 23:46:56 +02:00
Abdelilah El Aissaoui
bc56ad834a Added secondary surface color 2022-06-11 16:46:45 +02:00
Abdelilah El Aissaoui
9b876f05f0 Added alphabetical sorting to status entries 2022-06-11 16:33:02 +02:00
Abdelilah El Aissaoui
f57294c886 Moved "Files changed" alignment to the left 2022-06-11 14:36:24 +02:00
Abdelilah El Aissaoui
4bda2eb681 Fixed click not working for non-local branches items on side panel
Regression of change https://github.com/JetpackDuba/Gitnuro/pull/11
2022-06-11 14:17:21 +02:00
Abdelilah El Aissaoui
21c6f98bb3 Reduced flickering when refreshing diff or changing between items 2022-06-11 13:43:06 +02:00
Abdelilah El Aissaoui
9bf5fc4663 Fixed concurrency errors when trying to update recent repositories 2022-06-11 13:42:18 +02:00
Abdelilah El Aissaoui
b399947734 Fixed duplicated recent repositories entries 2022-06-11 13:37:42 +02:00
Abdelilah El Aissaoui
1dff1d66b5 Added delayed state change to processing state 2022-06-11 13:37:09 +02:00
Abdelilah El Aissaoui
878f6704d6 Fixed paddings around the menu bar 2022-06-11 13:36:43 +02:00
Abdelilah El Aissaoui
71c639b6a3 Moved staged/unstaged alignment to the left 2022-06-11 13:00:59 +02:00
Abdelilah El Aissaoui
d9c4e6f282 Improved logging 2022-06-11 12:58:55 +02:00
Abdelilah El Aissaoui
e92a3a5baa Reduced log flickering by hidding load unless it takes some time (constant) 2022-06-11 12:43:06 +02:00
Abdelilah El Aissaoui
c28a2834ae Fixed status scroll state being lost when staging files + reduced blinking on status view. 2022-06-11 12:40:00 +02:00
Abdelilah El Aissaoui
49d4dba1df Simplified author component 2022-06-11 12:31:57 +02:00
Infinity
c6163f1ef4 Add double click to checkout branch 2022-06-11 05:19:36 +02:00
Abdelilah El Aissaoui
8810150429 Remove unnecessary logs 2022-06-09 03:13:15 +02:00
Abdelilah El Aissaoui
e32498d0c7 Fixed repo refreshing when detecting changes in message files 2022-06-09 03:11:31 +02:00
Abdelilah El Aissaoui
8f2598d866 Disabled creation of branches/tags/stashes with empty string on enter or whitespaces 2022-06-07 20:10:30 +02:00
Abdelilah El Aissaoui
7156a976dc Added option to stash with a custom message 2022-06-07 20:08:21 +02:00
Abdelilah El Aissaoui
1380eced08 Merge branch 'high_dpi' into main 2022-06-06 15:02:42 +02:00
Abdelilah El Aissaoui
37b94bd7f6 Fixed blame/file history header paddings 2022-06-06 15:02:32 +02:00
Abdelilah El Aissaoui
3a100f547b Added dialog/window closing on pressing ESC
Should partially fix:
https://github.com/JetpackDuba/Gitnuro/issues/9
2022-06-06 14:58:53 +02:00
Abdelilah El Aissaoui
6901bf9f1c Fixed menu padding missalignments 2022-06-06 12:52:56 +02:00
Abdelilah El Aissaoui
a34c6f194d Adjusted headers colors 2022-06-06 03:22:41 +02:00
Abdelilah El Aissaoui
9ea8d0c99a Added new UI design 2022-06-06 02:44:18 +02:00
Abdelilah El Aissaoui
e47b6719eb Fixed graph when dpi is different than 1 2022-06-06 01:49:13 +02:00
Abdelilah El Aissaoui
c5f7ddf266 Fixed stage all when there are removed files 2022-06-06 01:41:41 +02:00
Abdelilah El Aissaoui
3cb7d25a33 Reduced alpha from line selected in light theme 2022-06-06 01:08:52 +02:00
Abdelilah El Aissaoui
290c5324f2 Fixed padding in "uncommited changes" line 2022-06-06 01:03:42 +02:00
Abdelilah El Aissaoui
67aff36bc4 Added persistance of commit message
Merge message is also recovered when having conflicts
2022-06-06 00:49:02 +02:00
Abdelilah El Aissaoui
7335499f97 Updated themes 2022-06-05 21:27:42 +02:00
Abdelilah El Aissaoui
d6ad3b3187 Added a new color scheme and fixed multiple theming issues 2022-06-05 20:34:38 +02:00
Abdelilah El Aissaoui
592a5c3179 Fixed diff header background having paddings 2022-06-04 15:41:41 +02:00
Abdelilah El Aissaoui
77edfe14d7 Added option to change commits limit 2022-06-04 04:56:45 +02:00
Abdelilah El Aissaoui
0341a4f577 Fixed open dir dialog showing "Save" instead of "Open" on Windows/MacOS 2022-06-02 19:25:21 +02:00
Abdelilah El Aissaoui
e8c3a3de6f Fixed new branch not appearing in the log 2022-06-01 15:01:51 +02:00
Abdelilah El Aissaoui
8a25dadc12 Moved date in "Commited changes" to fit better in low res screens 2022-06-01 12:12:31 +02:00
Abdelilah El Aissaoui
969233ec99 Added "File history" feature 2022-05-30 01:43:44 +02:00
Abdelilah El Aissaoui
9c1133a292 Added line numbers and text selection to blame 2022-05-28 16:28:39 +02:00
Abdelilah El Aissaoui
df03edf396 Removed unused imports 2022-05-28 16:12:49 +02:00
Abdelilah El Aissaoui
cd06819cfd Added error handling when a file can't be blamed 2022-05-28 16:12:09 +02:00
Abdelilah El Aissaoui
60a1ef21d8 Added hand icon on hover where it's intended to be 2022-05-27 20:07:24 +02:00
Abdelilah El Aissaoui
eca68aaf07 Multiple blame improvements
- Clicking on a diff now minimizes the blame
- Clicking on a commit of the blame will select this commit in the log and show the commit changes.
- Unified design of Diff and Blame
2022-05-27 19:50:41 +02:00
Abdelilah El Aissaoui
cb3fe17fee Rebase interactive is aborted when something fails during the process 2022-05-27 15:52:16 +02:00
Abdelilah El Aissaoui
f124d1fb9e Disabled fixup and squash for the first line of the rebase interactive 2022-05-27 13:30:07 +02:00
Abdelilah El Aissaoui
332c3ef73d Added try catch in case platform doesn't support opening URL in the browser 2022-05-26 23:55:54 +02:00
Abdelilah El Aissaoui
40366be75c Limited blame text line to a single line 2022-05-26 23:55:33 +02:00
Abdelilah El Aissaoui
8e366741ac Added basic version of blame 2022-05-26 23:40:15 +02:00
Abdelilah El Aissaoui
543545d93d Changed commited changes load block to avoid changing the state to loading when is not necessary 2022-05-23 19:36:06 +02:00
Abdelilah El Aissaoui
46cb205739 Fixed white screen blink when opening a new tab 2022-05-23 19:14:37 +02:00
Abdelilah El Aissaoui
143f98d07f Changed error dialog animation 2022-05-22 00:54:04 +02:00
Abdelilah El Aissaoui
51d79cff8f Reimplemented rebase interactive as a part of the tab instead of a dialog 2022-05-22 00:47:36 +02:00
Abdelilah El Aissaoui
364fa53558 Added option to stage/unstage file from diff header 2022-05-16 20:16:12 +02:00
Abdelilah El Aissaoui
c9a7f63a1c Changed cursor for log divider 2022-05-14 17:05:23 +02:00
Abdelilah El Aissaoui
3ab0936e44 Changed app font to OpenSans 2022-05-09 23:03:15 +02:00
Abdelilah El Aissaoui
2263785723 Changed item selection design 2022-05-09 22:02:24 +02:00
Abdelilah El Aissaoui
08f814c8d8 Added scroll to rebase interactive dialog 2022-04-16 04:59:03 +02:00
Abdelilah El Aissaoui
f60580750b Implemented reword on rebase interactive 2022-04-16 04:52:53 +02:00
Abdelilah El Aissaoui
cdf7d61045 Diff replaces a tab by 4 characters until compose bug is fixed
https://github.com/JetBrains/compose-jb/issues/615
2022-04-11 04:32:05 +02:00
Abdelilah El Aissaoui
b68135d3a4 Fixed crash when creating the graph if the repo contains tags that point to blobs 2022-04-11 04:27:25 +02:00
Abdelilah El Aissaoui
14eb5f8c9c Added first version of interactive rebase 2022-04-09 23:10:08 +02:00
Abdelilah El Aissaoui
08d0323e48 Improved tab's design 2022-04-09 18:59:10 +02:00
Abdelilah El Aissaoui
9f51893ed2 Hidden file not found exception when trying to fetch the icons from gravatar 2022-04-09 18:58:30 +02:00
Abdelilah El Aissaoui
f03165f70a Added max lines to welcome page text composables 2022-04-09 18:58:16 +02:00
Abdelilah El Aissaoui
d5cac58b87 Removed unused property 2022-04-08 22:26:23 +02:00
Abdelilah El Aissaoui
855b57196d Side menu items expand state is now stored in the viewModels to restore it's value after changing tabs 2022-04-08 22:05:48 +02:00
Abdelilah El Aissaoui
8650b1a43c Moved error state holding to the TabViewModel 2022-04-08 22:05:22 +02:00
Abdelilah El Aissaoui
1f58114404 Added exception throwing when rebase/merge failed due to uncommited changes 2022-04-08 21:43:47 +02:00
Abdelilah El Aissaoui
4f84c38fb4 Started replacement of the old tabs system with the new one 2022-04-08 21:30:13 +02:00
Abdelilah El Aissaoui
fac5cbf16a Increased version for the next release 2022-04-08 20:22:04 +02:00
Abdelilah El Aissaoui
fb8e41dfff Fixed lines in diff being cut when overflowing 2022-04-08 20:22:04 +02:00
Abdelilah El Aissaoui
b7179a5c20 Increased version code 2022-04-07 23:33:21 +02:00
Abdelilah El Aissaoui
c31b1a9d6b Fixed hunk stage on files with a single line without lineDelimiter 2022-04-07 23:06:20 +02:00
Abdelilah El Aissaoui
d055060483 Fixed crash on empty graph 2022-04-07 22:57:32 +02:00
Abdelilah El Aissaoui
7b4ab49a30 Increased refresh time when having multiple consecutive changes to 1s and added refresh when diff missing 2022-04-07 22:50:52 +02:00
Abdelilah El Aissaoui
c20021832f Fixed graph size not being recalculated after changing uncommited changes status 2022-04-07 22:44:34 +02:00
Abdelilah El Aissaoui
c71f7555de Fixed stage/unstage hunks not working on properly on specific line endings 2022-04-07 22:39:33 +02:00
Abdelilah El Aissaoui
5982c65c79 Fixed diff on index files when a repository is empty 2022-04-07 19:19:21 +02:00
Abdelilah El Aissaoui
685769a154 Increased project version to 0.1.1 2022-04-07 18:44:52 +02:00
Abdelilah El Aissaoui
1baab9e3f8 Fixed clone state being lost on error & multiple errros not being reported
Also updated errors strings to better clarify the issue
2022-04-07 18:41:53 +02:00
Abdelilah El Aissaoui
716d04df9a Merge branch 'status_optimizations' into main 2022-04-06 20:19:54 +02:00
Abdelilah El Aissaoui
b53b9b0b79 Now staged and unstaged use the same status to update the data (instead of executing it twice) 2022-04-06 20:19:29 +02:00
Abdelilah El Aissaoui
7f9da646ff Fixed uncommited changes line not appearing on rebase with a single conflict (no other changes) 2022-04-06 20:18:59 +02:00
Abdelilah El Aissaoui
51ea75c033 Removed done TODO tasks and added appScope cancellation on app exit 2022-04-06 20:02:56 +02:00
Abdelilah El Aissaoui
ab9c8ce2df Fixed unstage hunk not restoring lines properly 2022-04-06 19:48:30 +02:00
Abdelilah El Aissaoui
1e0660dca0 Refactored status to improve its performance and removed diff update handling 2022-04-06 19:39:06 +02:00
Abdelilah El Aissaoui
9927a249b9 Fixed invalid directory string on clone 2022-04-06 17:50:31 +02:00
Abdelilah El Aissaoui
4108537825 [WIP] started refactor of status 2022-04-06 17:49:38 +02:00
Abdelilah El Aissaoui
60a6fb1a3e Fixed file name not being completly displayed when it's in the root of the dir for commited changes 2022-04-04 21:00:17 +02:00
Abdelilah El Aissaoui
8d066f15dc Updated description 2022-04-04 19:00:32 +02:00
Abdelilah El Aissaoui
f8c7bd5515 Renamed project from references 2022-04-04 18:43:27 +02:00
Abdelilah El Aissaoui
f1868844a2 Extracted project name as a constant 2022-04-04 18:32:56 +02:00
Abdelilah El Aissaoui
27e8efcaf7 Added additional info dialog 2022-04-04 18:32:06 +02:00
Abdelilah El Aissaoui
6c1790ce24 Added refresh even if stash has failed 2022-04-04 05:12:11 +02:00
Abdelilah El Aissaoui
61d5ee941a Fixed file name not being completly displayed when it's in the root of the dir 2022-04-04 05:05:50 +02:00
Abdelilah El Aissaoui
dac6d597a2 Fixed date being moved if the message is too long 2022-04-04 03:00:51 +02:00
Abdelilah El Aissaoui
b980784b1f Changed secondary color & reorganized welcome/home screen 2022-04-04 02:58:51 +02:00
Abdelilah El Aissaoui
8f92b6d195 Added updates check 2022-04-04 02:48:40 +02:00
Abdelilah El Aissaoui
11ea0986c3 Fixed clone url replacing inbetween ".git" string (should only remove suffixes) 2022-04-04 00:19:03 +02:00
Abdelilah El Aissaoui
c1fdd891c6 Added clone progress and changed clone button to PrimaryButton 2022-04-03 19:43:54 +02:00
Abdelilah El Aissaoui
df638defb8 Removed unnecessary dispose (already using "use" extension) 2022-04-03 19:43:26 +02:00
Abdelilah El Aissaoui
e2449db568 Added padding at the end of the graph to avoid the last line being partially covered by the horizontal scrollbar of the graph 2022-04-03 19:22:45 +02:00
Abdelilah El Aissaoui
154ab89a21 Changed old style buttons to the new one 2022-04-03 01:29:18 +02:00
Abdelilah El Aissaoui
d662edba9d Improved clone dialog features by adding more error management & directory picker 2022-04-03 01:16:55 +02:00
Abdelilah El Aissaoui
59a36fed08 Graph now shows properly the HEAD commits when rebasing & commits referenced by unpeeled tags 2022-04-02 04:03:01 +02:00
Abdelilah El Aissaoui
457d604575 Removed unnecessary parameters from callbacks 2022-04-02 00:36:09 +02:00
Abdelilah El Aissaoui
5ab529e22b Updated repo URLs 2022-04-02 00:35:33 +02:00
Abdelilah El Aissaoui
a9accafafb Replaced direct usage of manager coroutineScope to use an method that handles errors 2022-04-01 20:30:19 +02:00
Abdelilah El Aissaoui
558f02fca4 Implemented basic local git init 2022-04-01 05:42:44 +02:00
Abdelilah El Aissaoui
54a1ab4436 Added loading screen when opening a repository 2022-04-01 05:00:06 +02:00
Abdelilah El Aissaoui
2dd6fb106e Filtered out uninitialized submodules from git diff 2022-03-31 22:09:59 +02:00
Abdelilah El Aissaoui
a32f4d5ccd Fixed text not being cleared after commit 2022-03-31 20:40:25 +02:00
Abdelilah El Aissaoui
054778bdcc Implemented graph search
Fixed bug where deleting text input value too fast (keeping pressed backspace) would not behave properly
2022-03-31 20:39:25 +02:00
Abdelilah El Aissaoui
d544cc4e94 Moved repository opening to repository manager 2022-03-30 00:08:53 +02:00
Abdelilah El Aissaoui
fc821ecb92 Fixed git paths using system dependant separator instead of fixed "/" 2022-03-04 15:43:29 +01:00
Abdelilah El Aissaoui
2466dd7a33 File picker styling is only applied in windows/macOs now 2022-03-04 14:53:49 +01:00
Abdelilah El Aissaoui
3352444371 Disabled the option to stage/unstage hunks when the repository is not in a safe state 2022-03-03 20:27:11 +01:00
Abdelilah El Aissaoui
33eb0f3c8a File watcher now also watched new added directories 2022-03-03 20:00:34 +01:00
Abdelilah El Aissaoui
aae80445f9 Moved delayed refresh to tabViewModel instead of the file watched and added detection of git dir changed to refresh the whole repository information 2022-02-25 16:51:52 +01:00
Abdelilah El Aissaoui
bbea356eb2 Added missing horizontal padding to commited changes files icon 2022-02-25 00:41:03 +01:00
Abdelilah El Aissaoui
afc7d9df8e Improved performance when multiple FS changes occur in a fraction of a second
Between update there is a minimum of 0.5s even if there have been multiple file updates
2022-02-25 00:40:11 +01:00
Abdelilah El Aissaoui
41ff6a57b8 Improved display of branches' names in branch context menu 2022-02-24 23:07:28 +01:00
Abdelilah El Aissaoui
dd56ccf2fc Now uncommited changes shows which diff entry has been clicked
Also refactored selected index from commit changes to use the same logic as uncommited changes
2022-02-24 15:41:10 +01:00
Abdelilah El Aissaoui
970132f1d7 File name is always shown in the changes log to cut the dir path 2022-02-24 14:51:12 +01:00
Abdelilah El Aissaoui
250ca295b9 Added option to pull/push from specific branch 2022-02-24 14:25:15 +01:00
Abdelilah El Aissaoui
b8e76aa7a8 Added push including tags option 2022-02-23 02:19:11 +01:00
Abdelilah El Aissaoui
8d00141df2 Improved settings dialog UI 2022-02-21 16:03:36 +01:00
Abdelilah El Aissaoui
84d986587d Reduced status sumary font size + fixed typo 2022-02-21 15:19:45 +01:00
Abdelilah El Aissaoui
b6c4fa0ed7 Reduced number of operations that have to be executed to update the status 2022-02-21 15:14:31 +01:00
Abdelilah El Aissaoui
4ed10c0682 Reformated project's code 2022-02-21 01:49:14 +01:00
Abdelilah El Aissaoui
a2d687caa8 Fixed flow warning 2022-02-20 23:02:12 +01:00
Abdelilah El Aissaoui
d8d4147d18 Fixed currently displayed diff entry being updated twice when changes are detected 2022-02-20 22:59:43 +01:00
Abdelilah El Aissaoui
fb377b9554 Changed graph border width and corner shape 2022-02-18 15:30:46 +01:00
Abdelilah El Aissaoui
82d9479e55 Changed multiple elements colors
Button and log border
2022-02-18 15:03:52 +01:00
Abdelilah El Aissaoui
7a86ed8227 Changed abort button colors 2022-02-18 12:30:30 +01:00
Abdelilah El Aissaoui
902626f04b Added exception when pull has failed 2022-02-17 23:18:51 +01:00
Abdelilah El Aissaoui
9dc5296a61 Return header if no branches match current ref (or null if empty repo) 2022-02-17 23:18:51 +01:00
Abdelilah El Aissaoui
32ef5d50cd Fixed crash when commits list is empty 2022-02-17 23:18:51 +01:00
Abdelilah El Aissaoui
f314dc2c26 Limited tab title lines to 1 2022-02-17 23:18:51 +01:00
Abdelilah El Aissaoui
afce2a2aa7 Added basic remotes management 2022-02-17 19:24:36 +01:00
Abdelilah El Aissaoui
df3f47f073 Untracked files are now staged before stash 2022-02-15 20:05:49 +01:00
Abdelilah El Aissaoui
0ff882a31c Added native look and file for system dialogs 2022-02-11 20:55:10 +01:00
Abdelilah El Aissaoui
587843d246 Changed how the diff list is created to improve scrollbar's behavior (used to change its size depending on the scroll position ???) 2022-02-11 20:47:20 +01:00
Abdelilah El Aissaoui
c374ac77d5 Fixed weird spacing when using fonts with different heights in lines with empty text in the diff 2022-02-11 20:34:13 +01:00
Abdelilah El Aissaoui
a3f233d363 Added option to refresh repository 2022-02-10 00:46:26 +01:00
Abdelilah El Aissaoui
93a1ef3240 Replaced hardcoded separator by OS dependant appropach 2022-02-08 19:29:20 +01:00
Abdelilah El Aissaoui
2a12c3e883 Changed scrollbar color scheme to make it more visible 2022-02-07 22:04:06 +01:00
Abdelilah El Aissaoui
e54ba6d8a0 Log code cleanup and added more comments 2022-02-07 20:39:30 +01:00
Abdelilah El Aissaoui
759d30014b Fixed context menu not working when clicking on the graph 2022-02-07 15:37:14 +01:00
Abdelilah El Aissaoui
7e86e3b2fd Reimplemented log view. Now graph can be horizontally scrolled 2022-02-07 15:34:21 +01:00
Abdelilah El Aissaoui
02313fe632 Implemented context menu for stash operations
Moved selected item to TabState, so every ViewModel can update the current selected tab state without having to use callbacks to the RepoOpened component. This allows to set currently selected item to "None" when droping a stash that has been selected
2022-02-06 22:57:46 +01:00
Abdelilah El Aissaoui
fff18b7fef Added uncommited files count to "uncommited changes" line in the log
Also improved log performance when a file has changed to only update the header and not the whole list
2022-02-06 20:49:54 +01:00
Abdelilah El Aissaoui
72e77f41fd Implemented cherry-pick 2022-02-05 19:19:49 +01:00
Abdelilah El Aissaoui
cb609c44cc Removed unused annotation 2022-02-05 03:12:20 +01:00
Abdelilah El Aissaoui
ac21b59f6c Implemented amend previous commit 2022-02-05 03:01:03 +01:00
Abdelilah El Aissaoui
e473d29167 Reformated project's code 2022-02-05 02:55:26 +01:00
Abdelilah El Aissaoui
df48b40ce5 Refactored safeProcessing to be able to refresh data even after a crash 2022-02-05 02:06:55 +01:00
Abdelilah El Aissaoui
9105940e00 Push deletion is done before doing it locally to prevent deleting the local branch in case of error 2022-02-05 01:35:44 +01:00
Abdelilah El Aissaoui
857032ec04 Remote branches in side panel is shown now without the remote name 2022-02-05 01:35:21 +01:00
Abdelilah El Aissaoui
cc787064b6 Clicking on a remote now colpases it
Removed animations from expandable to improve performance in big lists
2022-02-05 01:28:48 +01:00
Abdelilah El Aissaoui
7dc2ad0a72 All the tab is refreshed now after a push 2022-02-04 18:54:03 +01:00
Abdelilah El Aissaoui
07703a66be Added remote branch deletion 2022-02-04 18:53:21 +01:00
Abdelilah El Aissaoui
fc4d52b57a Temporary files are now deleted when exiting the app 2022-02-04 01:34:22 +01:00
Abdelilah El Aissaoui
35a6b9cdeb Limited max lines to 1 in the graph text 2022-02-03 15:12:04 +01:00
Abdelilah El Aissaoui
832189e91e Changed side panel headers to be expandables and improved its UI 2022-02-03 14:47:25 +01:00