diff --git a/app/build.gradle b/app/build.gradle index 420e7440e9..8c2123b45f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -237,8 +237,8 @@ android { dependencies { implementation project(':content-descriptions') - ksp("com.google.dagger:hilt-compiler:$daggerHiltVersion") ksp("androidx.hilt:hilt-compiler:$jetpackHiltVersion") + ksp("com.google.dagger:hilt-compiler:$daggerHiltVersion") ksp "com.github.bumptech.glide:ksp:$glideVersion" implementation 'androidx.compose.material3:material3-android:1.2.1' diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java index f3366802fc..5135c94248 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java @@ -51,12 +51,14 @@ import com.bumptech.glide.Glide; import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager; import com.google.android.material.tabs.TabLayout; import com.squareup.phrase.Phrase; + import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Locale; import kotlin.Unit; import network.loki.messenger.R; + import org.session.libsession.messaging.messages.control.DataExtractionNotification; import org.session.libsession.messaging.sending_receiving.MessageSender; import org.session.libsession.snode.SnodeAPI; @@ -335,10 +337,10 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity { .put(APP_NAME_KEY, getString(R.string.app_name)) .format().toString()) .onAnyDenied(() -> Toast.makeText(getContext(), - Phrase.from(context, R.string.permissionsStorageSaveDenied) - .put(APP_NAME_KEY, getString(R.string.app_name)) - .format().toString(), - Toast.LENGTH_LONG).show()) + Phrase.from(context, R.string.permissionsStorageSaveDenied) + .put(APP_NAME_KEY, getString(R.string.app_name)) + .format().toString(), + Toast.LENGTH_LONG).show()) .onAllGranted(() -> { new ProgressDialogAsyncTask>( context, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt index db7b487ae7..4716d7d0c8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt @@ -74,7 +74,7 @@ class DisappearingMessagesActivity: PassphraseRequiredActionBarActivity() { private fun setUpToolbar() { setSupportActionBar(binding.searchToolbar) supportActionBar?.apply { - title = getString(R.string.activity_disappearing_messages_title) + title = getString(R.string.disappearingMessages) setDisplayHomeAsUpEnabled(true) setHomeButtonEnabled(true) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt index 2ca747f5ea..aa0a07ecb8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt @@ -89,7 +89,7 @@ class HelpSettingsFragment: CorrectedPreferenceFragment() { // Change export logs button text val exportLogsButton = this.activity?.findViewById(R.id.export_logs_button) as TextView? if (exportLogsButton == null) { Log.w("Loki", "Could not find export logs button view.") } - exportLogsButton?.text = if (exportJobRunning) getString(R.string.cancel) else getString(R.string.activity_help_settings__export_logs) + exportLogsButton?.text = if (exportJobRunning) getString(R.string.cancel) else getString(R.string.helpReportABugExportLogs) // Show progress bar val exportProgressBar = this.activity?.findViewById(R.id.export_progress_bar) as ProgressBar? diff --git a/app/src/main/res/layout-sw400dp/view_seed_reminder.xml b/app/src/main/res/layout-sw400dp/view_seed_reminder.xml deleted file mode 100644 index 6cf362a80a..0000000000 --- a/app/src/main/res/layout-sw400dp/view_seed_reminder.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - -