Commit Graph

573 Commits

Author SHA1 Message Date
6543
b8d8b34b0e Show ContributorsTab only if you have permission to (#402)
add isRepoAdmin

extend Adapters

add check to RepoDetails

refactor var names

reformat code

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/402
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-14 19:25:36 +00:00
M M Arif
ab47e409e9 update libs, enhance release builds (#408)
Merge branch 'master' into update-libs-enhance-release-build

update libs, enhance release builds

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/408
2020-04-14 08:50:12 +00:00
opyale
344284c1c1 Improving issue template. (#401)
Final changes.

Merge branch 'master' into bug-desc-improve

Merge branch 'master' into bug-desc-improve

Removing unnecessary bar.

Simplifying stuff.

Some more examples.

Further improvements.

Further improvements.

Improving issue template.

Co-authored-by: opyale <example@example.com>
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/401
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-13 15:56:31 +00:00
M M Arif
b10df63c8a Merge pull request 'Adjusting size of text views in organizations list.' (#406) from opyale/GitNex:size-adj into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/406
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-13 15:55:17 +00:00
opyale
4cb0253b38 Adjusting size of text views in organizations list. 2020-04-13 17:31:39 +02:00
M M Arif
539c5be4b5 Themes for source code in file viewer (#403)
reformat code

move from else-if to switch-case

Merge branch 'master' into 396-themes-file-veiwer

Merge branch 'master' into 396-themes-file-veiwer

Make string translatable false

Themes for source code in file viewer

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/403
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-13 15:23:31 +00:00
M M Arif
008ffaa553 Merge pull request 'Fix of views being gone randomly' (#404) from 400-milestone-bug into master
Merging via app
2020-04-13 10:40:05 +00:00
6543
9a5a774d8c Merge branch 'master' into 400-milestone-bug 2020-04-13 10:20:18 +00:00
6543
2e452eaa81 Fix version API auth check (#399)
Merge branch 'master' into 389_alternate_version-api-auth

rm comment

get gitea Version Authentificated

Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/399
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-13 08:01:56 +00:00
M M Arif
3b84ec46d1 Fix of views being gone randomly 2020-04-13 12:48:23 +05:00
opyale
4123e03f7d Applying changes of LabelWidthCalculator to LabelsAdapter. (#398)
Trying to find a compromise.

make them great again ;)

Applying changes of LabelWidthCalculator to LabelsAdapter.

Co-authored-by: opyale <example@example.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/398
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-13 07:25:39 +00:00
M M Arif
3a524c9f5d Remember-login-type (#394)
Merge branch 'master' into 372-remember-login-type

# Conflicts:
#	app/src/main/java/org/mian/gitnex/activities/LoginActivity.java

Use strings instead of boolean

Remember login type

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/394
2020-04-12 19:15:20 +00:00
M M Arif
e709aba3c2 Remember login type (#392)
Merge branch 'master' into 372-remember-login-type

Remember login type

Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/392
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-12 19:04:02 +00:00
M M Arif
14bca1f4c4 Merge pull request 'Adding more reliable calculation of label width.' (#393) from opyale/GitNex:label-width-calc into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/393
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-12 18:53:44 +00:00
opyale
a7213add30 Adding more reliable calculation of label width. 2020-04-12 20:33:41 +02:00
opyale
df2bc91e9f Setting Manrope as default font. (#379)
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>
2020-04-12 15:19:33 +00:00
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
M M Arif
adb8a8bf04 Fix fab hide scroll issue and clean up (#381)
Merge branch 'fix-fab-scroll-issue' of gitea.com:gitnex/GitNex into fix-fab-scroll-issue

Merge branch 'master' into fix-fab-scroll-issue

Merge branch 'master' into fix-fab-scroll-issue

Fix fab hide scroll issue and clean up

Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/381
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-11 20:17:24 +00:00
M M Arif
398cceed2f Merge pull request 'Close/reopen milestone' (#386) from 329-close-open-milestone into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/386
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-11 06:59:40 +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
M M Arif
79944241fe Merge pull request 'Minor improvement and fixes for repo info tab' (#382) from fixes-repo-info into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/382
2020-04-07 21:23:38 +00:00
M M Arif
8b7c5e2873 Minor improvement and fix for repo info tab 2020-04-08 02:21:47 +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
e07ee1aceb Enabling counter badges by default. (#378)
Merge remote-tracking branch 'remotes/main/master' into counter-badges

# Conflicts:
#	app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java

Moving to BaseActivity

Enabling counter badges by default.

Co-authored-by: opyale <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/378
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-07 20:45:40 +00:00
6543
73950f9f2a Crowdin [2020-04-07] + add Polish (#377)
add Polish to settings and reformat code

add Polish locales

Crowdin Update

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/377
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-07 20:39:08 +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
M M Arif
9bca299107 Merge pull request 'fix' (#375) from 6543/GitNex:issue-subscribe-take-theme-into-account into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/375
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-07 13:44:47 +00:00
M M Arif
ee88ee86cd Merge pull request 'Fix repos loading on switching accounts' (#371) from fix-repos-load-on-login into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/371
Reviewed-by: 6543 <6543@noreply.gitea.io>
2020-04-07 13:43:38 +00:00
6543
ce51b9264a
fix
Signed-off-by: 6543 <6543@obermui.de>
2020-04-07 15:18:14 +02:00
M M Arif
831e9d36ec Fix repos loading on switching accounts 2020-04-07 11:05:42 +05:00
6543
da90005e42 hide ReleaseCounter Badge on old Gitea instances (#367)
Hide Release Count on old Gitea Instances

fix compareVersion

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/367
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-07 04:15:56 +00:00
opyale
d46db0475f Improving usability by including whole header in "Details". (#361)
Merge branch 'master' into usability-details

Improving usability by including whole header in "Details".

Co-authored-by: opyale <example@example.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/361
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-06 19:00:18 +00:00
6543
9b9173e33b [Doc] update issue-template add pull-template (#359)
fix

add sugestions

fix Nr

fix what atom did wrong (automatism)

Add PR template

make link from contributing to the code-standards

Update issue_template

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/359
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-06 09:38:02 +00: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
d2490bf6f9 Crowdin [2020-04-04] + add Spanish (#353)
add spanish to config

Merge branch 'master' into add-lang-spanish

Update 2020-04-04

adde Spanish (42% translated)

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/353
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-04 19:29:44 +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
M M Arif
36ebfff529 Merge pull request 'On Repo Lists: change comment-icon to issue-icon' (#351) from iconchange into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/351
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-04 06:41:55 +00:00
6543
fe0654b9eb
On Repo Lists: change comment-icon to issue-icon 2020-04-04 03:40:08 +02:00
anonTree1417
9b3a9aada7 Adding caching to picasso service (#345)
Merge remote-tracking branch 'remotes/main/master' into picasso-img-cache

Some improvements including size management and easy customization.

Improvements to picasso cache

Making PicassoCache public

Moving PicassoCache to helpers/

Merge branch 'master' into picasso-img-cache

Adding options for customisation.

(Hopefully) final bug fixes.

Additional fixes.

Hotfix.

Prevent NullPointerException.

Formatting stuff.

Removing unnecessary permission.

Adding permission.

Adding PicassoCache.

Using max-stale now.

Adding caching to picasso service

Co-authored-by: anonTree1417 <example@example.com>
Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/345
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-03 17:02:46 +00: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
51c281ca30 Merge pull request 'update libs and clean up' (#346) from update-libs into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/346
2020-04-03 06:29:57 +00:00
M M Arif
b9ca041c5b update libs and clean up 2020-04-03 11:28:24 +05:00
M M Arif
1d8dc445ec Merge pull request 'Support for self-signed certificates' (#318) from anonTree1417/GitNex:self-signed into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/318
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-03 06:16:01 +00:00
anonTree1417
63865fefec Merge remote-tracking branch 'remotes/main/master' into self-signed
# Conflicts:
#	app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
2020-04-02 23:07:20 +02:00
M M Arif
8234ad77e3 Merge pull request 'Fix #341 - Store UserName on Login first' (#343) from 6543/GitNex:fix-341 into master
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/343
2020-04-02 20:11:18 +00:00
6543
120c83a943 Merge branch 'master' into fix-341 2020-04-02 18:11:23 +00:00
anonTree1417
59e8f6f94a Fixing popup bug. 2020-04-02 19:11:23 +02:00