New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(images): option to use external proxy #313

Merged

dead8309 merged 9 commits into dead8309:master from kyrie25:use-external-url

Oct 26, 2024

Contributor

kyrie25 commented Oct 25, 2024

Supersedes #292

kyrie25 added 3 commits

October 25, 2024 19:20


          feat: use external proxy for images

c271d53


          feat(images): use imgur as alternate provider

d58053c


          chore: update translation

b04b7c6

kyrie25 force-pushed the use-external-url branch from a076f9d to b04b7c6 Compare

October 25, 2024 17:55

kyrie25 changed the title ~~feat: use external proxy for images~~ feat(images): option to use external proxy

dead8309 reviewed

View reviewed changes

data/src/main/java/com/my/kizzy/data/remote/ApiResponse.kt Outdated Show resolved Hide resolved

dead8309 reviewed

View reviewed changes

data/src/main/java/com/my/kizzy/data/remote/ApiService.kt Outdated Show resolved Hide resolved

dead8309 reviewed

View reviewed changes

data/src/main/java/com/my/kizzy/data/repository/KizzyRepositoryImpl.kt Outdated Show resolved Hide resolved

dead8309 reviewed

View reviewed changes

data/src/main/java/com/my/kizzy/data/rpc/KizzyRPC.kt Outdated Show resolved Hide resolved

dead8309 reviewed

View reviewed changes

feature_profile/src/main/java/com/my/kizzy/feature_profile/ui/component/ActivityRow.kt Outdated Show resolved Hide resolved

dead8309 reviewed

View reviewed changes

gradle/libs.versions.toml Outdated Show resolved Hide resolved

dead8309 reviewed

View reviewed changes

common/preference/src/main/java/com/my/kizzy/preference/Prefs.kt Outdated Show resolved Hide resolved


          chore: apply suggestion

159760b

kyrie25 requested a review from dead8309

October 26, 2024 02:37

kyrie25 added 2 commits

October 26, 2024 10:06


          fix(imgur): add missing declaration to git

0e048cd


          refactor(imgur): merge response classes

fb2c64e

dead8309 reviewed

View reviewed changes

data/src/main/java/com/my/kizzy/data/remote/ApiService.kt Outdated Show resolved Hide resolved

dead8309 reviewed

View reviewed changes

data/src/main/java/com/my/kizzy/data/remote/ImgurApiService.kt Outdated Show resolved Hide resolved

dead8309 reviewed

View reviewed changes

gradle.properties Outdated Show resolved Hide resolved

kyrie25 added 3 commits

October 26, 2024 17:24


          chore: apply suggestions

86f8b4b


          Merge branch 'master' into use-external-url

162ea2e


          chore: apply suggestions

3f7259e

kyrie25 mentioned this pull request

perf(gradle): use non-final res ids #317

Merged

kyrie25 requested a review from dead8309

October 26, 2024 10:31

dead8309 reviewed

View reviewed changes

data/src/main/java/com/my/kizzy/data/utils/Ext.kt Show resolved Hide resolved

Owner

dead8309 commented Oct 26, 2024

Looks good please squash all commits

Contributor Author

kyrie25 commented Oct 26, 2024 •

edited

Loading

Looks good please squash all commits

I'm pretty sure you have an option to squash merge yes?

Owner

dead8309 commented Oct 26, 2024

Looks good please squash all commits

I'm pretty sure you have an option to squash merge yes?

Sry I meant rebase from master and squash I'm not able to do that in github ui

Contributor Author

kyrie25 commented Oct 26, 2024 •

edited

Loading

Sry I meant rebase from master and squash I'm not able to do that in github ui

Correct me if I'm wrong but I'm pretty sure squash and commit on Github does squash all commits and rebase it on top of master 🤔

Owner

dead8309 commented Oct 26, 2024

I guess it just squashes all into 1 and don't rebase(don't need that anyway)

dead8309 merged commit 9d17a1b into dead8309:master

1 check passed

dead8309 added the hacktoberfest-accepted label

Contributor Author

kyrie25 commented Oct 26, 2024

Fair enough, cheers!

kyrie25 deleted the use-external-url branch

October 26, 2024 12:05

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hacktoberfest-accepted