Fix default branch
Merge branch 'master' into switch-branches
# Conflicts:
# app/src/main/res/layout/bottom_sheet_repo.xml
# app/src/main/res/values/strings.xml
update icon
Merge branch 'master' into switch-branches
Merge branch 'master' into switch-branches
update the missing parts
Minor updates
Merge branch 'master' into switch-branches
Merge branch 'master' into switch-branches
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
# app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
# app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java
# app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
Add branch to breadcrumb and dir structure fix
Make change branch work
clean up
Merge branch 'master' into switch-branches
add icon in top bar, add interface listener
Merge branch 'master' into switch-branches
Merge remote-tracking branch 'remotes/main/master' into switch-branches
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java
# app/src/main/java/org/mian/gitnex/helpers/PathsHelper.java
Switching between branches.
Minor fixes
Merge remote-tracking branch 'remotes/main/master' into login-fix
URL parsing, label and other improvements.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@noreply.codeberg.org>
Co-authored-by: opyale <opyale@noreply.gitea.io>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/571
Reviewed-by: 6543 <6543@noreply.codeberg.org>
Merge branch '450-drafts-settings' of codeberg.org:gitnex/GitNex into 450-drafts-settings
Fix package move
Merge branch 'master' into 450-drafts-settings
Merge branch 'master' into 450-drafts-settings
fix default value save
Delete drafts settings
Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/576
Reviewed-by: opyale <opyale@noreply.codeberg.org>
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
Fix name collision in themes
Add space between org and repo name
standard use of dimens
more ui improvements
wip to enhance all bottom sheets
Fix radius and improve the ui
enhance bottom sheet
Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-by: opyale <opyale@noreply.codeberg.org>
Add download assets
implement release layout in adapter
update the layout
Fixing gravity.
Adding layouts for new release items.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: opyale <opyale@noreply.gitea.io>
Reviewed-by: 6543 <6543@noreply.codeberg.org>
Design changes and updating dependencies.
Small fix.
Adding missing library.
Cleanup.
Improving design of organisation detail page.
Co-authored-by: opyale <opyale@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
Fixing NullPointerException when image isn't loaded yet.
Display country instead of raw language code.
Minor improvements and contrasting color.
First changes.
Co-authored-by: opyale <opyale@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
Implement archived repo in all adapters
Merge branch 'archive-repo2' into archive-repo
Fix typos
Fixing gravity.
Restoring old names.
Design changes.
Adjusting sizing.
Improving design of archived message.
Show archived repo message and other fixes
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: opyale <opyale@noreply.gitea.io>
Reviewed-by: opyale <opyale@noreply.codeberg.org>
Adding comments to editorconfig.
Formatting.
Adding link color attribute.
Minor improvements.
Use dedicated layout for additional information.
Co-authored-by: opyale <opyale@noreply.gitea.io>
Reviewed-by: 6543 <6543@noreply.codeberg.org>
Removing unused strings.
Adding a little bit more space between title and progress bar.
Swapping icons.
Merge remote-tracking branch 'remotes/main/master' into improve-milestones
# Conflicts:
# app/src/main/res/layout/list_milestones.xml
Minor improvements.
Merge branch 'improve-layouts' of https://gitea.com/opyale/GitNex into improve-milestones
Merge branch 'improve-layouts' of https://gitea.com/gitnex/GitNex into improve-milestones
Moving items.
Merge branch 'master' into improve-layouts
Merge branch 'master' into improve-layouts
Translation and additional formatting.
Enhancing editorconfig
Formatting and removing unused imports.
Removing milestone state.
Improving milestones.
branches and milestones layout update. Fix milestone infinite pagination loop for lower versions
layout updates for issues, pr. Fix pr nullable objects for lower versions
improve files layout
improve org info and list orgs
improve teams list layout by org
Fix repo layouts
Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/525
Reviewed-by: M M Arif <mmarif@swatian.com>
remove strings
translation: generic but with contecxt
Merge branch 'milestones-filter' of gitea.com:gitnex/GitNex into milestones-filter
Clean up strings
Merge branch 'master' into milestones-filter
clean up and add missing parts
enhance and refactor milestone, added filter for closed and open ms
change to viewbinding
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/506
Reviewed-by: 6543 <6543@noreply.gitea.io>
delete branch API call
Add fork repo info for branch
Check if pr is mergeable, show message if not.
Use checkbox instead of button
make ripple effects work for buttons with enable/disable
introduce viewbinding
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/496
Reviewed-by: 6543 <6543@noreply.gitea.io>
update string names
Update strings
Merge branch 'master' into imprufe-issue-subscription-checking
switch icon as per @mmarif
Migrate to new Version Check & disable IssueSubscription function for gitea < 1.12.0
Merge branch 'master' into imprufe-issue-subscription-checking
Merge branch 'master' into imprufe-issue-subscription-checking
Merge branch 'master' into imprufe-issue-subscription-checking
refactor & use dismiss()
realy check If issue is subscribed
add 200 http Status check and handle it
Rename WatchRepository to WatchInfo & add checkIssueWatchStatus
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/445
Reviewed-by: M M Arif <mmarif@swatian.com>
decrease the compression to have better results
Move cache size outside of maxsize method. fix progress bar alignment for files
Add cache size to picasso
Use getAbsolutePath
Merge branch 'app-cache' of gitea.com:gitnex/GitNex into app-cache
Few imprvoements
Merge branch 'master' into app-cache
small improvement
Implement configure cache size and clear it
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/482
Reviewed-by: opyale <opyale@noreply.gitea.io>
Applying sizes.
Additional changes.
First changes.
Merge branch 'master' into diff-cleaner
Fixing formatting.
Merge branch 'master' into diff-cleaner
Final changes for working with custom themes.
Merge remote-tracking branch 'remotes/main/master' into diff-cleaner
First changes for working with custom themes.
Merge branch 'master' into diff-cleaner
Merge branch 'master' into diff-cleaner
Merge branch 'master' into diff-cleaner
Merge branch 'master' into diff-cleaner
Merge branch 'master' into diff-cleaner
Adding custom COLOR_FONT.
Even smaller cleanups.
Merge remote-tracking branch 'remotes/main/master' into diff-cleaner
Small cleanups.
Fixing bug and adding maximum line limit.
Adding option to set cursor to end and small cleanup.
First aid.
Merge branch 'master' into diff-cleaner
Merge branch 'master' into diff-cleaner
Merge branch 'master' into diff-cleaner
Few improvements.
Performance improvements and cleanups.
Minor improvements (code in order) and many bug fixes
Bug fix.
Combining cited code.
Adding code commenting option.
Renaming list_files_diffs_new to list_files_diffs
Moving ProcessBar into center
Increasing performance.
Applying size to all icons globally.
Removing another unused file.
Merge remote-tracking branch 'remotes/main/master' into diff-cleaner
Removing unused files.
Changing size of 'close'-button.
Major changes concerning design and bug fixes.
Temporary save point.
2
1
Co-authored-by: opyale <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/413
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
Code Reformat
hide not found message
Refactor issues, remove fastadapter.
fix swipe back filter icon issue, fix crash on issues with faster swiping
Change filter icon based on selection, empty the list for progress bar, check for gitea version to pass limit and other improvements
Separate menu and interface for pr
Add filter bottom sheet to PRs, issues
Fix search/filter pull requests
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/439
Reviewed-by: opyale <opyale@noreply.gitea.io>
Merge branch 'master' into 427-dismiss-bottom-sheet
Does not really fix the issue as there is way to handle this without a proper call.
And dismiss does not work properly either.
But added few improvements and fixed close/reopen issue along the way.
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/428
Reviewed-by: 6543 <6543@noreply.gitea.io>
new strings for tabs
Merge branch 'refactor-issues' of gitea.com:gitnex/GitNex into refactor-issues
Fix conflicts and files refactors
Merge branch 'master' into refactor-issues
Merge branch 'master' into refactor-issues
refactored closed issues in new tab
Added gitea ver check, minor ui fixes
Merge branch 'master' into refactor-issues
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
Refactored open issues
Added parent fragment
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/380
Revert "store default if user didnt touch Font settings"
This reverts commit 9c5f9731
store default if user didnt touch Font settings
Setting translatable to false
Last changes.
Defaulting to Manrope in strings.xml
Default to Manrope in settings.
Changes in default value.
Automatic formatting.
Merge remote-tracking branch 'remotes/main/master' into manrope
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
Manrope just literally as default font.
Reformatting code.
Making optimizations.
Moving initialization to BaseActivity
Merge remote-tracking branch 'remotes/main/master' into manrope
Setting Manrope as default font.
Co-authored-by: opyale <example@example.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/379
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
Merge branch 'master' into extend-merge-dialog
Minor fixes
format
? an AndroidStudio suggestion ?
Signed-off-by: 6543 <6543@obermui.de>
add Title Text and some Fixes
add version check
Merge branch 'master' into extend-merge-dialog
Merge branch 'master' into extend-merge-dialog
use translation and revormat
make Merge Options Translateble
gitea locale revs:
* pulls.merge_pull_request
* pulls.rebase_merge_pull_request
* pulls.rebase_merge_commit_pull_request
* pulls.squash_merge_pull_request
Fix menu item
Make merge options work
Merge branch 'master' into merge-options
work - but UGLY UI
use enum for merge-modes
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/217
