6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Import https://github.com/vector-im/riot-android/pull/3111/files in RiotX

Browse Source
This commit is contained in:
Benoit Marty
2019-06-13 10:33:04 +02:00
parent 480d197ffa
commit 6cd3b4dd95
8 changed files with 83 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vector/src/main/res/layout/item_loading.xml
View File

@ -1,7 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/progressBar"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_height="wrap_content"
android:background="?riotx_background"
android:padding="16dp" />
android:orientation="vertical">
<TextView
android:id="@+id/loadingText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/layout_vertical_margin"
android:gravity="center"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
tools:text="Waiting message" />
<ProgressBar
android:id="@+id/loadingProgress"
android:layout_width="match_parent"
android:layout_height="80dp"
android:padding="16dp" />
</LinearLayout>

1
vector/src/main/res/values/strings.xml
View File

@ -1379,6 +1379,7 @@ Why choose Riot.im?
<string name="keys_backup_settings_untrusted_backup">To use Key Backup on this device, restore with your passphrase or recovery key now.</string>
<string name="keys_backup_settings_deleting_backup">Deleting backup…</string>
<string name="keys_backup_settings_delete_backup_error">Failed to delete backup (%s)</string>
<string name="keys_backup_settings_checking_backup_state">Checking backup state</string>
<string name="keys_backup_settings_delete_confirm_title">Delete Backup</string>
<string name="keys_backup_settings_delete_confirm_message">Delete your backed up encryption keys from the server? You will no longer be able to use your recovery key to read encrypted message history.</string>