diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-08-31 14:45:36 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-08-31 14:45:36 +0200 |
commit | 47c29e584229f1fe98d5456d66a32bb9f081afa5 (patch) | |
tree | faafd4a0bfac960d66697512d96e8622b7fdcecb /src/main/res | |
parent | f7c293387b84f9fc416529ed6c08217a35b0474e (diff) |
allow backup to be restored from selected file
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/drawable-hdpi/ic_cloud_download_white_24dp.png | bin | 0 -> 463 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/ic_cloud_download_white_24dp.png | bin | 0 -> 262 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/ic_cloud_download_white_24dp.png | bin | 0 -> 491 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxhdpi/ic_cloud_download_white_24dp.png | bin | 0 -> 900 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_cloud_download_white_24dp.png | bin | 0 -> 985 bytes | |||
-rw-r--r-- | src/main/res/menu/import_backup.xml | 11 | ||||
-rw-r--r-- | src/main/res/values/attrs.xml | 2 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 3 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 3 |
9 files changed, 19 insertions, 0 deletions
diff --git a/src/main/res/drawable-hdpi/ic_cloud_download_white_24dp.png b/src/main/res/drawable-hdpi/ic_cloud_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..7bd405bf8 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_cloud_download_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_cloud_download_white_24dp.png b/src/main/res/drawable-mdpi/ic_cloud_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..1936cf196 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_cloud_download_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_cloud_download_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cloud_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..b7ce55e69 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_cloud_download_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_download_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cloud_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..901546a91 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_cloud_download_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_cloud_download_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cloud_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..1767bdbfd --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_cloud_download_white_24dp.png diff --git a/src/main/res/menu/import_backup.xml b/src/main/res/menu/import_backup.xml new file mode 100644 index 000000000..9d0453ac6 --- /dev/null +++ b/src/main/res/menu/import_backup.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/action_open_backup_file" + android:icon="?attr/ic_cloud_download" + android:title="@string/open_backup" + app:showAsAction="always" /> + +</menu>
\ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index e7d44519e..afea492b3 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -99,6 +99,8 @@ <attr name="ic_attach_video" format="reference" /> <attr name="ic_attach_videocam" format="reference" /> + <attr name="ic_cloud_download" format="reference" /> + <attr name="ic_file_apk" format="reference" /> <attr name="ic_file_pdf" format="reference" /> <attr name="ic_file_vcard" format="reference" /> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 8b97b2af6..d29ff110b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -927,4 +927,7 @@ <string name="event">Event</string> <string name="pref_vibrate_in_chat_summary">Vibrate when a new message arrives in an open chat</string> <string name="pref_vibrate_in_chat">Vibrate in open chat</string> + <string name="open_backup">Open backup</string> + <string name="not_a_backup_file">The file you selected is not a Conversations backup file</string> + <string name="account_already_setup">This account has already been setup</string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index b9261a4d5..fb91cb4a1 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -104,6 +104,7 @@ <item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item> <item name="icon_delete" type="reference">@drawable/ic_delete_black_24dp</item> <item name="icon_share" type="reference">@drawable/ic_share_black_24dp</item> + <item name="ic_cloud_download" type="reference">@drawable/ic_cloud_download_white_24dp</item> <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item> <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_black</item> @@ -280,6 +281,8 @@ <item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item> <item name="icon_delete" type="reference">@drawable/ic_delete_white_24dp</item> <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item> + <item name="ic_cloud_download" type="reference">@drawable/ic_cloud_download_white_24dp + </item> <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item> <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_white</item> |