diff --git a/app/build.gradle b/app/build.gradle index be3ff79..584ac9f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,11 +10,14 @@ def versionMinor = 1 def versionPatch = 459 android { + compileSdk 36 + buildToolsVersion "36" + namespace "sk.virtualvoid.nyxdroid.v2" + defaultConfig { applicationId "sk.virtualvoid.nyxdroid.v2" minSdkVersion 21 - compileSdk 31 - targetSdkVersion 31 + targetSdk 36 multiDexEnabled true versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch versionName "${versionMajor}.${versionMinor}.${versionPatch}" @@ -69,7 +72,7 @@ dependencies { implementation project(':slidingmenujf') implementation platform('com.google.firebase:firebase-bom:27.0.0') - + implementation "androidx.core:core:1.17.0" implementation 'androidx.appcompat:appcompat:1.3.0' implementation "androidx.legacy:legacy-preference-v14:1.0.0" implementation "androidx.preference:preference:1.1.1" diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/BaseActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/BaseActivity.java index 49fe558..7d8c0e0 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/BaseActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/BaseActivity.java @@ -21,6 +21,10 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.graphics.Insets; +import androidx.core.view.OnApplyWindowInsetsListener; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/BookmarksActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/BookmarksActivity.java index 1a4804b..6883c99 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/BookmarksActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/BookmarksActivity.java @@ -151,8 +151,8 @@ public boolean onQueryTextChange(String newText) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.refresh: + int id = item.getItemId(); + if (id == R.id.refresh){ return refresh(); } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/GalleryActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/GalleryActivity.java index a64665e..2c77300 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/GalleryActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/GalleryActivity.java @@ -157,12 +157,12 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.ge_openbrowser: - return viewInBrowser(); - case R.id.ge_begin: - return toBegin(); - case R.id.ge_current: + int id = item.getItemId(); + if (id == R.id.ge_openbrowser){ + return viewInBrowser();} + if (id == R.id.ge_begin){ + return toBegin();} + if (id == R.id.ge_current){ return toCurrent(); } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/MailActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/MailActivity.java index 479f9d4..fc0ebee 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/MailActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/MailActivity.java @@ -37,6 +37,7 @@ import android.widget.ListView; import android.widget.ProgressBar; import androidx.appcompat.widget.SearchView; +import androidx.core.content.ContextCompat; /** @@ -186,7 +187,7 @@ public void onRefreshStarted(View view) { }); refreshReceiverEnabled = true; - registerReceiver(refreshReceiver, new IntentFilter(Constants.REFRESH_MAIL_INTENT_FILTER)); + registerReceiver(refreshReceiver, new IntentFilter(Constants.REFRESH_MAIL_INTENT_FILTER), Context.RECEIVER_NOT_EXPORTED ); load(true, null, null, null); } diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/MailComposeActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/MailComposeActivity.java index 2e49150..4a7082d 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/MailComposeActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/MailComposeActivity.java @@ -188,14 +188,14 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: + int id = item.getItemId(); + if (id == android.R.id.home){ setResult(Constants.REQUEST_RESPONSE_CANCEL); finish(); - return true; - case R.id.attachment: - return attachment(); - case R.id.send: + return true;} + if (id == R.id.attachment){ + return attachment();} + if (id == R.id.send){ send(); return true; } diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/NotificationsActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/NotificationsActivity.java index 9f5dbe1..4ad8e9c 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/NotificationsActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/NotificationsActivity.java @@ -79,7 +79,7 @@ public void onRefreshStarted(View view) { }); refreshReceiverEnabled = true; - registerReceiver(refreshReceiver, new IntentFilter(Constants.REFRESH_NOTICES_INTENT_FILTER)); + registerReceiver(refreshReceiver, new IntentFilter(Constants.REFRESH_NOTICES_INTENT_FILTER), Context.RECEIVER_NOT_EXPORTED ); refresh(); } diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/SettingsActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/SettingsActivity.java index fdac930..7af8bd8 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/SettingsActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/SettingsActivity.java @@ -63,10 +63,10 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.clear_credentials: - return clearCredentials(); - case R.id.clear_drawable_cache: + int id = item.getItemId(); + if (id == R.id.clear_credentials){ + return clearCredentials();} + if (id == R.id.clear_drawable_cache){ return clearDrawableCache(); } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/WriteupComposeActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/WriteupComposeActivity.java index e024601..8aeb5f1 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/WriteupComposeActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/WriteupComposeActivity.java @@ -182,18 +182,18 @@ else if (replyingWriteupList == null) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: + int id = item.getItemId(); + if (id == android.R.id.home){ setResult(Constants.REQUEST_RESPONSE_CANCEL); finish(); - return true; - case R.id.attachment: - return attachment(); - case R.id.send: - return send(); - case R.id.voteup: - return vote(VotingType.POSITIVE); - case R.id.votedown: + return true;} + if (id == R.id.attachment){ + return attachment();} + if (id == R.id.send){ + return send();} + if (id == R.id.voteup){ + return vote(VotingType.POSITIVE);} + if (id == R.id.votedown){ return vote(VotingType.NEGATIVE); } return false; diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/WriteupsActivity.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/WriteupsActivity.java index dd7c9ae..f79cf59 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/WriteupsActivity.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/WriteupsActivity.java @@ -437,18 +437,18 @@ public boolean onQueryTextChange(String newText) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.compose: + int id = item.getItemId(); + if (id == R.id.compose) return composeOne(null); - case R.id.refresh: + if (id == R.id.refresh) return load(null, null, false); - case R.id.gallery: + if (id == R.id.gallery) return galleryGrid(); - case R.id.replytomorewriteups: + if (id == R.id.replytomorewriteups) return replyToMoreWriteups(); - case R.id.book_or_unbook: + if (id == R.id.book_or_unbook) return bookOrUnbook(); - } + return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/MailActionMode.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/MailActionMode.java index 0107548..4a6ee9b 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/MailActionMode.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/MailActionMode.java @@ -24,17 +24,17 @@ public MailActionMode(Activity context, Listener listener) { @Override public boolean onActionItemClicked(ActionMode mode, MenuItem item) { - switch (item.getItemId()) { - case R.id.reply: + int id =item.getItemId(); + if (id == R.id.reply){ listener.onReply(); - return true; - case R.id.copy: + return true;} + if (id == R.id.copy){ listener.onCopy(); - return true; - case R.id.reminder: + return true;} + if (id == R.id.reminder){ listener.onReminder(); - return true; - case R.id.delete: + return true;} + if (id == R.id.delete){ listener.onDelete(); return true; } diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/WriteupsActionMode.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/WriteupsActionMode.java index f9438de..173f0cf 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/WriteupsActionMode.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/WriteupsActionMode.java @@ -23,32 +23,32 @@ public WriteupsActionMode(Activity context, Listener listener) { @Override public boolean onActionItemClicked(ActionMode mode, MenuItem item) { - switch (item.getItemId()) { - case R.id.reply: + int id= item.getItemId(); + if (id == R.id.reply){ listener.onReply(); - return true; - case R.id.sendmail: + return true;} + if (id == R.id.sendmail) { listener.onSendMail(); - return true; - case R.id.viewreplies: + return true;} + if (id == R.id.viewreplies){ listener.onViewReplies(); - return true; - case R.id.viewrating: + return true;} + if (id == R.id.viewrating){ listener.onViewRating(); - return true; - case R.id.copy: + return true;} + if (id == R.id.copy){ listener.onCopy(); - return true; - case R.id.view_as_gallery_from_here: + return true;} + if (id == R.id.view_as_gallery_from_here){ listener.onViewGallery(); - return true; - case R.id.reminder: + return true;} + if (id == R.id.reminder){ listener.onReminder(); - return true; - case R.id.delete: + return true;} + if (id == R.id.delete){ listener.onDelete(); - return true; - case R.id.copylink: + return true;} + if (id == R.id.copylink){ listener.onCopyLink(); return true; } diff --git a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/WriteupsReplyMoreActionMode.java b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/WriteupsReplyMoreActionMode.java index 389571e..4db8f17 100644 --- a/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/WriteupsReplyMoreActionMode.java +++ b/app/src/main/java/sk/virtualvoid/nyxdroid/v2/am/WriteupsReplyMoreActionMode.java @@ -43,8 +43,8 @@ private void restoreState() { @Override public boolean onActionItemClicked(ActionMode mode, MenuItem item) { - switch (item.getItemId()) { - case R.id.reply: + int id = item.getItemId(); + if (id == R.id.reply){ listener.onReply(); return true; } diff --git a/app/src/main/res/layout/authorization.xml b/app/src/main/res/layout/authorization.xml index 6705a05..16fb9a0 100644 --- a/app/src/main/res/layout/authorization.xml +++ b/app/src/main/res/layout/authorization.xml @@ -8,7 +8,8 @@ + android:orientation="vertical" + android:paddingTop="90dp"> + android:orientation="vertical" + android:paddingTop="90dp"> + android:background="?android:attr/windowBackground" + android:paddingTop="90dp">