Commit Graph

219 Commits

Author SHA1 Message Date
6543
145043a515 Extend Merge Options (#217)
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
2020-04-11 20:20:26 +00:00
6543
1acbd7dc9f Merge branch 'master' into 329-close-open-milestone 2020-04-11 06:44:30 +00:00
M M Arif
f5d5264ef7 Implement auto switcher for light and dark theme (#388)
Remove import and add author

Implement auto switcher for light and dark theme. other ui fixes

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/388
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-11 06:06:39 +00:00
M M Arif
0caaa63b06 Close/reopen milestone 2020-04-08 23:31:27 +05:00
opyale
e310a16bad Improving design of "Repository Meta" (#362)
Merge branch 'master' into details-design

Always open "Repository Meta"

Fixing bugs.

Merge remote-tracking branch 'remotes/main/master' into details-design

Typo removal.

Do not show pull requests when API returns null.

Replacing size by watchers

Removing unused imports.

Moving time formatting into TimeHelper.

Changing website icon and renaming button and dialog text.

Further contentDescription

Adding contentDescription

Adding support for "timeFormat"

Merge remote-tracking branch 'remotes/main/master' into details-design

Full support for translation.

Partially supporting translation.

Adding "view additional information".

Adding additional information.

Adding forks count.

First design changes.

Improving usability by including whole header in "Details".

Co-authored-by: opyale <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/362
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-07 21:17:12 +00:00
opyale
7387c29077 Replacing bottom sheet item by floating action button. (#360)
Merge branch 'fab-button-issues' of https://gitea.com/opyale/GitNex into fab-button-issues

Merge remote-tracking branch 'remotes/main/master' into fab-button-issues

Merge branch 'master' into fab-button-issues

Adding onScrollListener.

Reply icon

Generalizing padding of floating action button.

Merge branch 'master' into fab-button-issues

Improving proportions.

Replacing bottom sheet item by floating action button and cleaning up code.

Co-authored-by: opyale <example@example.com>
Co-authored-by: anonTree1417 <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/360
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-07 20:06:39 +00:00
6543
ce51b9264a fix
Signed-off-by: 6543 <6543@obermui.de>
2020-04-07 15:18:14 +02:00
6543
1dc61af683 Add Issue Subscribtion (#203)
rename Context

move things to IssueActions

rm unused API func

get Context only one time

add repoWatch into tinyDB

add maginal Issue Un-/Subscription support

add Issue Subscribtion

 * api
 * layout

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/203
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-05 09:54:34 +00:00
6543
1da54e3d35 [UI] Add Pull & Release Counter Badge to TabLable (#350)
fix cp error

fix

reformat code

remove issuesCounter

check if API return new objects, make settings option more generic

Merge branch 'master' into 218-PR-Tab_OpenNumber

add Release Counter

Rename Issue Badge and add Pull Badge

Upgrade Gradle and delete a useles commend

Json Responce: add OpenPullCount and ReleaseCount

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/350
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-04 19:20:25 +00:00
M M Arif
c402046699 Introduce snackbar for toast messages (#352)
Merge branch 'master' into 302-snackbar

Added snackbar to login screen

Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/352
2020-04-04 19:19:44 +00:00
6543
fe0654b9eb On Repo Lists: change comment-icon to issue-icon 2020-04-04 03:40:08 +02:00
M M Arif
9e77e27177 Share comment of an issue (#348)
cleanup

Use html_url to fix issue/pr separation

Share comment of an issue

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/348
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-03 16:48:22 +00:00
M M Arif
70581cd330 Updates to settings screen 2020-04-02 20:49:26 +05:00
anonTree1417
c6125f83c7 Merge remote-tracking branch 'remotes/main/master' into self-signed
# Conflicts:
#	app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
2020-04-02 10:45:52 +02:00
anonTree1417
abdfe8d9d1 Adding option to delete certificates. 2020-04-02 02:59:00 +02:00
M M Arif
1e52649b76 Added to labels, issue comment 2020-04-01 14:44:38 +05:00
M M Arif
ca37ad661d Changed repos list menus to bottom sheets 2020-04-01 11:38:14 +05:00
anonTree1417
dd2339ec34 Small design changes (#327)
Merge remote-tracking branch 'remotes/main/master' into add-styling

Restoring branches_list.xml

Small design changes.

Co-authored-by: anonTree1417 <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/327
Reviewed-by: M M Arif <mmarif@swatian.com>
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-03-31 18:49:39 +00:00
anonTree1417
d87bd3a8f7 Merge remote-tracking branch 'remotes/main/master' into add-styling 2020-03-31 20:09:06 +02:00
anonTree1417
f12219ace7 Restoring branches_list.xml 2020-03-31 16:52:39 +02:00
anonTree1417
60781ac4c3 Small design changes. 2020-03-31 05:14:24 +02:00
M M Arif
d52ff1557f Fix login issue with internet access. Better solution to check internet connection
with broadcast receiver. Prioritize token login.
2020-03-28 19:49:08 +05:00
M M Arif
6842ba1410 Remove commits tab, moved under branch. Commits are under branches now.
Fixes search ui along the way
2020-03-28 17:44:45 +05:00
M M Arif
21aae88e62 Refactor naming convention for better findings 2020-03-28 15:52:09 +05:00
M M Arif
ea9025296a final implementation and ui completion of commits list 2020-03-27 23:59:24 +05:00
M M Arif
c8164c56d0 Initial work on commits list using paging library 2020-03-25 19:43:40 +05:00
M M Arif
7e8d2c6ec2 Create repository from organization menu, refactors too 2020-03-17 15:32:03 +05:00
M M Arif
6cb06d918d Fix divider color in themes 2020-03-17 01:07:23 +05:00
M M Arif
8df11645e8 Add file size to Files (#292)
Merge branch 'master' into 290-file-size

# Conflicts:
#	app/src/main/res/values/strings.xml

Generic word for size text

Add file size to Files

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/292
2020-03-16 20:01:49 +00:00
M M Arif
79bd96f6a2 Share feature and some refactor to easily manage source code files 2020-03-17 00:28:03 +05:00
M M Arif
c47c81e71f Prepare release 2.4.0 (#283)
Remove Translucent background

Fix missing theme colors, layouts using standard

Fix toolbar color

Prepare 2.4.0 release

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/283
2020-03-15 15:09:26 +00:00
M M Arif
c981ec2f16 Fixes for 2.4 release (#281)
Fix unnecessary reset for repositories

merge screen background color

Merge branch 'master' into fixes-2.4

Add bottom margin for smaller devices

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/281
2020-03-14 14:22:50 +00:00
M M Arif
e7433fd67d Merge pull request '[Fileviewer] Download files, Don't render specific files' (#275) from 254-download-files into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/275
2020-03-13 19:29:24 +00:00
M M Arif
64839fdc44 fix background color 2020-03-13 19:30:43 +05:00
6543
a2672560da Merge branch 'master' into 254-download-files 2020-03-11 15:29:37 +00:00
M M Arif
4ac1f4f486 Single issue ui enhancements (#272)
Merge branch 'master' into 270-single-issue-ui-enhancements

improve single issue title

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/272
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-03-08 14:14:46 +00:00
M M Arif
181a94edbe download file and ask for permissions to write into storage 2020-03-08 12:46:31 +05:00
M M Arif
3794d7ff2b wip on download files 2020-03-08 10:53:00 +05:00
M M Arif
9a9b836c40 Fix file diff background 2020-03-07 13:30:45 +05:00
M M Arif
61f953d70d Fixes layout issue with themes, added pdf night mode switch in settings 2020-03-06 18:46:22 +05:00
M M Arif
14addf5ed0 added theme selection to settings, updated login layout. 2020-03-06 01:56:42 +05:00
M M Arif
b012a7058d Fixes to color styles and layouts 2020-03-05 20:23:15 +05:00
M M Arif
51ab3f7a92 updated all the layouts and activities 2020-03-05 00:37:28 +05:00
M M Arif
a8cc4c00b8 worked on repo info, files tabs and files activity 2020-03-04 21:15:57 +05:00
M M Arif
d557999a38 Merge branch 'master' into light-theme 2020-03-04 19:58:03 +05:00
M M Arif
1008b8611d Added custom attr to more files 2020-03-04 19:54:21 +05:00
M M Arif
5720c5f613 Remove credits, add donators (#268)
Merge branch 'master' into 264-remove-credits

Merge pull request 'Support for c header files' (#266) from 265-files-support-in-file-viewer into master

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/266

Remove credits, add donators

support for c header files

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/268
2020-02-21 05:58:36 +00:00
M M Arif
acdb9ce682 updates to other files 2020-02-20 10:19:52 +05:00
M M Arif
dbcd80eace updated settings, star and my repos layouts 2020-02-04 19:19:39 +05:00
M M Arif
8b75cac9d8 New spinner style 2020-02-03 00:14:38 +05:00