Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceManager;

Expand Down Expand Up @@ -108,7 +104,6 @@ protected void onCreate(final Bundle savedInstanceState) {

setSupportActionBar(binding.toolbar);
binding.toolbar.setOnClickListener((v) -> fragment.showEditTitleDialog());
setImeInsets();

getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
@Override
Expand All @@ -120,33 +115,6 @@ public void handleOnBackPressed() {
});
}

private void setImeInsets() {
final var window = getWindow();
if (window == null) {
return;
}

WindowCompat.setDecorFitsSystemWindows(window, false);

final var decorView = window.getDecorView();
ViewCompat.setOnApplyWindowInsetsListener(decorView, (v, insets) -> {
Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
Insets navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars());

// Apply bottom padding when keyboard is shown
int bottomPadding = Math.max(imeInsets.bottom, navBarInsets.bottom);

v.setPadding(
v.getPaddingLeft(),
v.getPaddingTop(),
v.getPaddingRight(),
bottomPadding
);

return insets;
});
}

@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
commonsVersion = '2.4.1'
androidCommonsVersion = '1.1.1'
nextcloudAndroidCommonLib = "0.34.0"
singleSignOnVersion = "1.3.4"
singleSignOnVersion = "5bbe3739d2"
}
repositories {
mavenCentral()
Expand Down
36 changes: 16 additions & 20 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-logging" name="commons-logging" version="1.2"/>
<trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
<trusted-key id="0E225917414670F4442C250DFD533C07C264648F">
<trusting group="androidx.annotation"/>
<trusting group="androidx.appcompat"/>
<trusting group="androidx.collection"/>
<trusting group="androidx.core"/>
Expand Down Expand Up @@ -181,8 +182,6 @@
<trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
<trusted-key id="635EE627345F3C1DD422B2E207D3516820BCF6B1" group="com.github.ben-manes.caffeine" name="caffeine" version="2.9.3"/>
<trusted-key id="638DBA7FF338F537EACB7AC0AE1B9D6007DDFA7C" group="com.google.testparameterinjector"/>
<trusted-key id="64B9B09F164AA0BF88742EB61188B69F6D6259CA" group="com.google.accompanist"
name="accompanist-drawablepainter" version="0.37.3" />
<trusted-key id="64B9B09F164AA0BF88742EB61188B69F6D6259CA" group="com.google.accompanist" name="accompanist-drawablepainter" version="0.37.3"/>
<trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="^com[.]google($|([.].*))" regex="true"/>
<trusted-key id="696B6199A2A9D8C29CE78CC0D041CAD2E452550F" group="com.google.protobuf"/>
Expand Down Expand Up @@ -331,6 +330,8 @@
<trusting group="org.jsoup" name="jsoup" version="1.21.2"/>
</trusted-key>
<trusted-key id="F3BD845679DD6A30F3F50F91597852B0B140F0BC" group="com.caverock" name="androidsvg-aar" version="1.4"/>
<trusted-key id="F3FF33E96F18AA62DD580F9651FBF517CE6D6B80" group="gradle" name="gradle"/>
<trusted-key id="F4DD59C90148BDC52BEB90A4530AA5F25C25011F" group="commons-io"/>
<trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A" group="org.apache" name="apache"/>
<trusted-key id="FA7929F83AD44C4590F6CC6815C71C0A4E0B8EDD" group="net.java.dev.jna"/>
<trusted-key id="FAABC3738B1F58DA2D776FA2EB380DC13C39F675" group="com.intellij" name="annotations" version="12.0"/>
Expand Down Expand Up @@ -3078,12 +3079,6 @@
<artifact name="core-1.19.0.aar">
<sha256 value="55445ad0ff025963929892569a0bfc6b4c68e60d8b7c965dcffba09048c36c8e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.core" name="core" version="1.19.1">
<artifact name="core-1.19.1.aar">
<sha256 value="08108ea780205bd54603088a62a6dd5378f63bd25542674be24cd4cdb8191a09"
origin="Generated by Gradle" />
</artifact>
</component>
<component group="androidx.core" name="core" version="1.19.1">
<artifact name="core-1.19.1.aar">
Expand Down Expand Up @@ -3786,12 +3781,6 @@
<artifact name="fragment-1.9.0.aar">
<sha256 value="8e9070295de026efd015ef9cc6156caacd2509300fdf0bc9c7ccbc78c476ab4b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.fragment" name="fragment" version="1.9.1">
<artifact name="fragment-1.9.1.aar">
<sha256 value="72f70815c0a4d502f15c57e5e6bc861e64c5338ea06de75aed83969b17a2a727"
origin="Generated by Gradle" />
</artifact>
</component>
<component group="androidx.fragment" name="fragment" version="1.9.1">
<artifact name="fragment-1.9.1.aar">
Expand Down Expand Up @@ -14018,6 +14007,14 @@
<sha256 value="7567b6eb9817a4785a900eef12dfb0231611b030db2b17721c6fc62785f6d77c" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="Android-SingleSignOn" version="5bbe3739d2">
<artifact name="Android-SingleSignOn-5bbe3739d2.aar">
<sha256 value="55e4c379d8e2d1b79c0cf71ffbb930a1476f70ee73ccc8d9947b40867970a0b1" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="Android-SingleSignOn-5bbe3739d2.module">
<sha256 value="cf55b7633efdfe34db1d95f54bf21e10fa677910571c444d8ccd3a77979d76e4" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="Android-SingleSignOn" version="ab41fe72d4">
<artifact name="Android-SingleSignOn-ab41fe72d4.aar">
<sha256 value="60cf4e8db291c411be42d725edb16a8ee8eae28ede740475a3bbbcae660b7621" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -16221,12 +16218,6 @@
<artifact name="guava-33.7.1-android.jar">
<sha256 value="603942ca694ea40060a0a54dd620c05668c904736bb4e16c80760e77e69c107d" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.google.guava" name="guava" version="33.7.2-jre">
<artifact name="guava-33.7.2-android.jar">
<sha256 value="b949fe975a32421c1a2633c07a4f1578b462f2f467668aa0a4023c5ff7c4a808"
origin="Generated by Gradle" reason="Artifact is not signed" />
</artifact>
</component>
<component group="com.google.guava" name="guava" version="33.7.2-jre">
<artifact name="guava-33.7.2-android.jar">
Expand Down Expand Up @@ -18295,6 +18286,11 @@
<sha256 value="d189ff2c0027e96bb65d31e6f227ed2af966169b36af1e973dd5ba08926dc7b5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="98">
<artifact name="commons-parent-98.pom">
<pgp value="F4DD59C90148BDC52BEB90A4530AA5F25C25011F"/>
</artifact>
</component>
<component group="org.apache.httpcomponents" name="httpclient" version="4.5.14">
<artifact name="httpclient-4.5.14.jar">
<sha256 value="c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6" origin="Generated by Gradle"/>
Expand Down
Loading