TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-05 08:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed some legacy strings & substituted others

Browse Source
This commit is contained in:
alansley
2024-07-26 13:57:09 +10:00
parent aa1db13e3a a495ec232a
commit 3cee4bc12f
120 changed files with 41 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -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'

10
app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
View File

@@ -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<Void, Void, List<SaveAttachmentTask.Attachment>>(
context,

2
app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt
View File

@@ -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)
}

2
app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt
View File

@@ -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?

76
app/src/main/res/layout-sw400dp/view_seed_reminder.xml
View File

@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
android:orientation="vertical">
<ProgressBar
style="@android:style/Widget.ProgressBar.Horizontal"
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="@dimen/accent_line_thickness"
android:paddingLeft="-2dp"
android:paddingRight="-2dp"
android:progressTint="?colorAccent"
android:progress="80" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="@dimen/medium_spacing"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/titleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:textColor"
android:textSize="@dimen/small_font_size"
android:textStyle="bold"
android:text="@string/view_seed_reminder_title" />
<TextView
android:id="@+id/subtitleTextView"
android:layout_width="260dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="?android:textColor"
android:textSize="@dimen/very_small_font_size"
android:lines="2"
android:alpha="0.6"
android:text="@string/view_seed_reminder_subtitle_1" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginLeft="4dp" />
<Button
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/button"
android:contentDescription="@string/AccessibilityId_continue"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginLeft="4dp"
android:textStyle="normal"
android:text="@string/theContinue" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal" />
</LinearLayout>

2
app/src/main/res/layout/activity_disappearing_messages.xml
View File

@@ -14,7 +14,7 @@
app:contentInsetStart="0dp"
app:subtitle="@string/activity_disappearing_messages_subtitle"
app:subtitleTextAppearance="@style/TextAppearance.Session.ToolbarSubtitle"
app:title="@string/activity_disappearing_messages_title" />
app:title="@string/disappearingMessages" />
<androidx.compose.ui.platform.ComposeView
android:id="@+id/container"

2
app/src/main/res/layout/activity_home.xml
View File

@@ -116,7 +116,7 @@
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/activity_home_outdated_client_config"
android:text="@string/deleteAfterGroupFirstReleaseConfigOutdated"
/>
<ImageView
android:layout_margin="@dimen/small_spacing"

2
app/src/main/res/layout/export_logs_widget.xml
View File

@@ -8,7 +8,7 @@
android:layout_gravity="center"
style="@style/Widget.Session.Button.Common.Filled"
android:textStyle="bold"
android:text="@string/activity_help_settings__export_logs"
android:text="@string/helpReportABugExportLogs"
android:paddingHorizontal="@dimen/medium_spacing"
android:paddingVertical="12dp"
android:layout_width="wrap_content"

77
app/src/main/res/layout/view_seed_reminder.xml
View File

@@ -1,77 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
android:orientation="vertical">
<ProgressBar
style="@android:style/Widget.ProgressBar.Horizontal"
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="@dimen/accent_line_thickness"
android:paddingLeft="-2dp"
android:paddingRight="-2dp"
android:progressTint="?colorAccent"
android:progress="80" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/AccessibilityId_recovery_phrase_reminder"
android:gravity="center_vertical"
android:padding="@dimen/medium_spacing"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/titleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/small_font_size"
android:textStyle="bold"
android:text="@string/view_seed_reminder_title" />
<TextView
android:id="@+id/subtitleTextView"
android:layout_width="224dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/very_small_font_size"
android:lines="2"
android:alpha="0.6"
android:text="@string/view_seed_reminder_subtitle_1" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginLeft="4dp" />
<Button
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:contentDescription="@string/AccessibilityId_continue"
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginLeft="4dp"
android:textStyle="normal"
android:text="@string/theContinue" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal" />
</LinearLayout>