kyori19
1228f645a6
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-13 00:59:06 +09:00
Mélanie Chauvel
2fc3ba3cee
Replace “status” by “post” in strings name and source values ( #2405 )
2022-03-27 12:23:25 +02:00
kyori19
4a8fa74f79
Merge commit '224161caf111a15887cbc8a419763e87fe69931d'
2022-03-04 00:37:23 +09:00
Colin Kinloch
c37ccbb6e8
Add confirmation for favourite and bookmark actions ( #2245 )
...
* Add confirmation for favourite and bookmark actions
* Favourite confirmation american spelling and default values
* Remove bookmarking confirmation
* Update app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
2021-10-04 07:48:44 +02:00
kyori19
2005b32dfa
Merge remote-tracking branch 'tuskyapp/develop'
2021-07-03 23:59:57 +09:00
Konrad Pozniak
16ffcca748
add ktlint plugin to project and apply default code style ( #2209 )
...
* add ktlint plugin to project and apply default code style
* some manual adjustments, fix wildcard imports
* update CONTRIBUTING.md
* fix formatting
2021-06-28 21:13:24 +02:00
kyori19
609dcf46cb
Merge remote-tracking branch 'tuskyapp/develop'
2021-04-28 11:54:29 +09:00
Konrad Pozniak
ff69a2ad0d
migrating to ViewBinding part 2: Activities ( #2093 )
2021-03-07 19:05:51 +01:00
kyori19
a746009f74
Merge remote-tracking branch 'tuskyapp/develop'
2021-03-04 15:08:48 +09:00
Konrad Pozniak
6ebbe5f657
fix crash when rotating screen in a preference dialog twice ( #2083 )
2021-02-23 18:53:43 +01:00
Konrad Pozniak
483beaa957
move onOptionsItemSelected to BaseActivity ( #2059 )
...
* move onOptionsItemSelected to BaseActivity
* revert change in ComposeActivity
2021-01-31 20:27:02 +01:00
kyori19
bb5106a18d
Merge remote-tracking branch 'tuskyapp/develop' into master
2020-09-06 12:52:19 +09:00
Konrad Pozniak
1d309850b0
convert EmojiPreference and EmojiCompatFont to Kotlin ( #1922 )
...
* convert EmojiPreference and EmojiCompatFont to Kotlin
* move preference related to to dedicated preference package
* update proguard-rules.pro
* reformat & add comment
* maintain disposable information in EmojiPreference instead of EmojiCompatFont
2020-09-02 12:27:51 +02:00