Skip to content

Commit 4a2d744

Browse files
Merge pull request #2672 from fm-sys/padding-in-note-preview
add bottom padding in note preview
2 parents f391057 + 4a27f36 commit 4a2d744

File tree

3 files changed

+1834
-15
lines changed

3 files changed

+1834
-15
lines changed

app/src/main/res/layout/fragment_note_preview.xml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,25 @@
2525
android:orientation="vertical"
2626
tools:context="it.niedermann.owncloud.notes.edit.EditNoteActivity">
2727

28-
<it.niedermann.android.markdown.MarkdownViewerImpl
29-
android:id="@+id/single_note_content"
28+
<LinearLayout
3029
android:layout_width="match_parent"
3130
android:layout_height="wrap_content"
32-
android:layout_marginHorizontal="@dimen/spacer_activity_sides"
33-
android:lineSpacingMultiplier="@dimen/note_line_spacing"
34-
android:padding="@dimen/spacer_2x"
35-
android:paddingHorizontal="@dimen/spacer_2x"
36-
android:textAppearance="?android:attr/textAppearanceMedium"
37-
android:textColor="@color/fg_default"
38-
android:textIsSelectable="true"
39-
tools:text="@tools:sample/lorem/random" />
31+
android:orientation="vertical"
32+
android:paddingBottom="72dp">
33+
34+
<it.niedermann.android.markdown.MarkdownViewerImpl
35+
android:id="@+id/single_note_content"
36+
android:layout_width="match_parent"
37+
android:layout_height="wrap_content"
38+
android:layout_marginHorizontal="@dimen/spacer_activity_sides"
39+
android:lineSpacingMultiplier="@dimen/note_line_spacing"
40+
android:padding="@dimen/spacer_2x"
41+
android:paddingHorizontal="@dimen/spacer_2x"
42+
android:textAppearance="?android:attr/textAppearanceMedium"
43+
android:textColor="@color/fg_default"
44+
android:textIsSelectable="true"
45+
tools:text="@tools:sample/lorem/random" />
46+
</LinearLayout>
4047
</ScrollView>
4148
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
4249

gradle/verification-keyring.keys

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2436,6 +2436,50 @@ pIXjPlQ0i6kV0h8KapE1Uo005JYgeg==
24362436
=ASmD
24372437
-----END PGP PUBLIC KEY BLOCK-----
24382438

2439+
pub 1DE461528F1F1B2A
2440+
uid Julian Reschke (CODE SIGNING KEY) <[email protected]>
2441+
2442+
sub D4569BDF799A59AB
2443+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2444+
2445+
mQINBFd7wYcBEAC1jmtowY8q/BXHFr4bOvA4WtniUcECC36dHmQzd3LrG8zdDPK4
2446+
DgO/5w8xdilEe7BRD9etCV/uKXVM3KsKjFDHgh2puge4JElbePQL5l1oMmDUIGpK
2447+
cj+O7REa8fSAh8MOKRYTBQ6C8z3S4iEJuiiO73gvoe8XvAdoM9tN6G8lh8HBcpIZ
2448+
OT552jofRcStDw5WRKWj/MFYnqacReFo4ni6i+A733P+vtU5ZzWqtvhza6YNy4YA
2449+
dLTqc2AUzCGFSEaFLTxQNuUGPaykvTUqnN+6sg2EY+3aTLoR2FuXJLN+iwYekWS0
2450+
GBwS/mkK5uvj3+PlIxuuYWu79Aa4W/g4bLzlRZBEigh5yHYHR8qcsBoINiZIq/Ak
2451+
7Az1QQRZd9WJFXQFusFTsCcrMt/5FOaBZml92uiLrVQzn8azt9G6aVK6m8yIlLE0
2452+
Ya1Qvt4oGijY+BKNnoiKBBJnQuay4y0dgfolpdmFZf7BR2wmh4Svzttwt00v2OEB
2453+
6Qs+caUz4uoa6mzDpuFaZaIpdP4kTSwsGdwqemHsjLaAYcdWssTOi9oS+ioUNjLa
2454+
sIPGtI8pZ0WuN1X/IRSGSA6d/S+efqDGGyRligMtxuUicCk7+ew0fQ4dNxettN0B
2455+
/wKRJ0ZP9TClw1jdLHDcuonI+8gxdxiT6dNOzCjMssQ1D4qfV56SenTNAQARAQAB
2456+
tDZKdWxpYW4gUmVzY2hrZSAoQ09ERSBTSUdOSU5HIEtFWSkgPHJlc2Noa2VAYXBh
2457+
Y2hlLm9yZz65Ag0EV3vBhwEQAJfPmNzuUFCB3grJBPq+XTxA25hFAUJJyguOLcnv
2458+
MSXKqjT6O3IVetA3C5PEp1uFwqtPV6KqWjv9kFjMMwH9hDBsn+wrrODKst2jz57U
2459+
bVIBaOW+hBGCCY0gwfLrtGNkLeUHZ2TIvBbBpc0y7LI4ZcmuGcIa++kwVscAW60u
2460+
zkOHip8D5ch1WB070kM6ZmIx6aW2DgxHcp3S+Q0MH8HzUkZPKRniNtaJmNJgeXeF
2461+
jEJZe72EGJECAcnuyenS87Bsuf/6lhIN8ThuuKkwGnc0SaxQSwI9qiCHvgI6s63z
2462+
+eT21PRJE4P73+4zzSgwmEyLYeQU+q1R9DqIoOGzUAiEXqETMOwDPXFp5WV/K+Ep
2463+
cCvzPWkn8ojje9F5JjGRzxFFv7HgtILurmLrHtEEMaO9hN7MVyh8cnbgHZpVk5YJ
2464+
9Y3Szm3DtMYljhVa9+j/K/0887yT4XvktUX1jQLj1ItglA3vLUeWN/8ifnmbEqfT
2465+
NnMXDpvUGNxbUasHcGjV81kExbVBmM9PH02g6wb8K9x1dqOF1owD7zbzssbkP1VS
2466+
FX9RnqwRCLZdtUyQmePj2ES/F+nm4Gns4kI+O0VqQqGCkyZoYbaSpnL/Jz86USKs
2467+
xV1dDbVMKzFDkslbxX1X5z7ZeKA4HRvqfcAfMzl67zlcG8af6Nu5uTnnFDE4mF8A
2468+
LXx7ABEBAAGJAh8EGAECAAkFAld7wYcCGwwACgkQHeRhUo8fGyrJ+BAAh3L+kebn
2469+
F33N19iwVI2dEddDigZutE7Lq2KRr2BQtn53eINQ7FvEsnXy35fZPu/sjaEsYT43
2470+
zfK6uXCx4+DP0ySPMl3rdLuOjJ8hrWYWX1R9yqQIAdL4AOqMX6eXWTCS2lwxoFpz
2471+
0dCIonadn8xwftaHgcHebjAtAChd80ckKk9wMbBRxdi3i6+8aeqARf/SZt5toxbm
2472+
zXg+oDFDnCigta7xkR2olc72xWhimjBUMMuoQuicpz46huQRCqc5fh79KbKHvaUo
2473+
2eEOhN9mGFAfmCJJipe9EDxLfYlnnmlZpAYPSkQLffcEPK9p1Q++voSkb/48GpB7
2474+
lW+Sf7yyVdiqhbUMpy7SuX5c0cOpv1hucaPs0ripKjvRSMvhOH5kPoQtqXGq4AcR
2475+
OElystZcX7VEuNZZFymlVJWlAo9M0HFVWcuAZRLGAZIWM2uPhhebqeElDOJORU3B
2476+
3sKQjtdKY1zidyPsjsKuTeq2qkq6bJTbJkZmu/7SX/qAP1Q0fEvsFhGf0ou6RFxe
2477+
Rlu5Z4N59K6lkXo9+GLAWuc99maXWuYioln5OcoP7xTaFZwqDlF+Z9/Pxzu1foQW
2478+
B8KrqPXwhp7/Z3JmW/7jP4EeiXKgA5r4tbBjZnugOhkeRv58z0IKlLLo0c4raiuJ
2479+
ZAstgdvEqFLHh1yX4I+if5VODD2nEzXFDzE=
2480+
=d5S6
2481+
-----END PGP PUBLIC KEY BLOCK-----
2482+
24392483
pub 1F7A8F87B9D8F501
24402484
uid Download <[email protected]>
24412485

@@ -2772,6 +2816,39 @@ XInYCvIHMa9ZqicOSUcI5QCYu5TufvIE7Eq3Khh2Ex1FiOaEA+57LMrt6NsSKXrB
27722816
=xA7Z
27732817
-----END PGP PUBLIC KEY BLOCK-----
27742818

2819+
pub 2D6641C6AF88103E
2820+
uid Maven Central Java.net import (Used to sign artifacts imported from Java.net repos) <[email protected]>
2821+
2822+
sub 376179DC810188ED
2823+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2824+
2825+
mQGiBEvHiBERBACWsrXr/oU5TYqCoX2pGlKVop38NX9/klFswZue0YMrAlEP3cid
2826+
nQS7TYgEbUUIe25FFX7EsaiLoBDO0xKDcbO21vddThcBwF/cTwVrBvHThMECI1jX
2827+
BUthK1UHgtn4JgFCmRSg8YVvG7jd2EU+TetdLiagwqF5aJpW8HlYjlkWZwCguQwG
2828+
tsB0aNyAM47PEmaPdRsqd3sEAIyLOe6UdvuZaS45j0oNp35llY/FzXATI9cZJu8B
2829+
HBjPtadKSkHUqiGoY1GFWw+DJXAwGiVuISOuiIzj9V7JYRDPmm5KMQphU9Wt66Vo
2830+
dLB5821lg1aLsLxwT08q7lPsbfkdzpV6IEs6Xpjiixc36T3wtW/USLhKkSwhPMeJ
2831+
EWJfA/9wq71QBxjDqOVtfddX6lCBaLP22SSZ0UIfkL3cPKFu1BlHqm1W4g/TtppQ
2832+
i50NLN820IRDsZFQYK/c3e6uX1je5ovsro4C4mtex0e1Z1TULVeVooAnX/yjK8CF
2833+
Ftggucz0ti56cqpfjhpbn1JtVJdrZ9V4vc97qOXoyRxx/v4sa7RtTWF2ZW4gQ2Vu
2834+
dHJhbCBKYXZhLm5ldCBpbXBvcnQgKFVzZWQgdG8gc2lnbiBhcnRpZmFjdHMgaW1w
2835+
b3J0ZWQgZnJvbSBKYXZhLm5ldCByZXBvcykgPHJlcG9zaXRvcnlAc29uYXR5cGUu
2836+
Y29tPrkCDQRLx4gYEAgArRqEyhMVJS+IzyZkNirv++XDskoFFWbMF1u3xmBNGeZo
2837+
vmuXdsfonVaYjGIW3KU/RfHzyaHwe2DWnPXkz1duRD3ZU4FwIWLaZhEm9I1Uf+B+
2838+
6rUYj8u1ZUk/P6pY1m0ADPbrj1TS13HAyX8QoKm4qjaqMTtgheCJ05GIsqeqSk3R
2839+
9GWEE2WPoO5IiUh8iy/xK+poufNVxRJUeMD6rn7WfK3pmtPF55elPVJnCiEnUBkm
2840+
pcdfCo/bAp9u/0MbGkFunXvs0kwi7AK8DilC1JT7htsbWkLWN7kBcHNlt8sjMlge
2841+
gEku0f7pOrlabVTydHL36bmAQwxN14NfgDJKG8fh/wADBQf/TfAnCFsHoQ8rig70
2842+
zMQ16YSSHL0nrzAID/44Db5kji7+iD9P7a4jZd/nyIqzKeeJOqfN4t+F5xVgmdc0
2843+
335JRRsIzsa0t3VE0+6yjEDAueBJvjyZtxKlBgDMUXR0h2TFxTCekN0BYnmkjVhL
2844+
xhuOvkUNNwff0JRlTMBTd7q1ImYF00xUoo4YCd0X++VsviduNT3rS/G9OIbqwswj
2845+
de+XKTraowpbRADse5HFPfZNbB1qJdWWY1CZC0JCVKwZ8rVpHWqmxK6H8JKqJwt1
2846+
XGw6pHhkkeBCaeh/JVY9N0jLMBWUATJdvQqPcR6sb25co9UkNXpEOCrRnzjsyVj5
2847+
++jlQYhJBBgRAgAJBQJLx4gYAhsMAAoJEC1mQcaviBA+FSUAnR5Xi/qPEHd1cXSp
2848+
wdAqGKwCen3WAJwIsFD8tHGarvnRqo0ij3FERxwR3A==
2849+
=TljG
2850+
-----END PGP PUBLIC KEY BLOCK-----
2851+
27752852
pub 34918B7D3969D2F5
27762853
uid Brad Corso <[email protected]>
27772854

@@ -4071,6 +4148,22 @@ ymOZIduHXX1X+KzlRZTXvv4tSFnIQ0mWY1ySiOJQJS2WABVwFpFc8rECm6eN
40714148
=z4dc
40724149
-----END PGP PUBLIC KEY BLOCK-----
40734150

4151+
pub 793FD5751A0F0780
4152+
uid Block Open Source Releases <[email protected]>
4153+
4154+
sub 59EF9FBBED4216F5
4155+
-----BEGIN PGP PUBLIC KEY BLOCK-----
4156+
4157+
mDMEZzuZjRYJKwYBBAHaRw8BAQdA/FAoxAeXKY80R8UZ35NNr06SMFqC3Pv/LtP2
4158+
sZS+7N60M0Jsb2NrIE9wZW4gU291cmNlIFJlbGVhc2VzIDxvc3MtcmVsZWFzZXNA
4159+
YmxvY2sueHl6Prg4BGc7mY0SCisGAQQBl1UBBQEBB0BxT6NyXTVMCaIjZGa2M+/h
4160+
z+xbicRNpHTpudCgcUvccwMBCAeIfgQYFgoAJhYhBB0hf4R17unxmrjda3k/1XUa
4161+
DweABQJnO5mNAhsMBQkSzAMAAAoJEHk/1XUaDweAmCgA/2x1ZfeK2BbKUoPDvSHk
4162+
bdks1K3OorITH/c1RHMJZe1TAP92RwDPmqy7YsZDKctpFeA0jhlWBNvbNTNkzRNu
4163+
yEjMCg==
4164+
=Eg1b
4165+
-----END PGP PUBLIC KEY BLOCK-----
4166+
40744167
pub 79752DB6C966F0B8
40754168
uid Rob Manning <[email protected]>
40764169

0 commit comments

Comments
 (0)