diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/drawable-hdpi/ic_help_circle_outline_black_24dp.png | bin | 0 -> 888 bytes | |||
| -rw-r--r-- | src/main/res/drawable-mdpi/ic_help_circle_outline_black_24dp.png | bin | 0 -> 670 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xhdpi/ic_help_circle_outline_black_24dp.png | bin | 0 -> 1435 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_help_circle_outline_black_24dp.png | bin | 0 -> 1979 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_help_circle_outline_black_24dp.png | bin | 0 -> 4762 bytes | |||
| -rw-r--r-- | src/main/res/layout/activity_enter_name.xml | 1 | ||||
| -rw-r--r-- | src/main/res/layout/activity_set_settings.xml | 239 | ||||
| -rw-r--r-- | src/main/res/values/bools.xml | 5 | ||||
| -rw-r--r-- | src/main/res/values/defaults.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 20 |
11 files changed, 265 insertions, 11 deletions
diff --git a/src/main/res/drawable-hdpi/ic_help_circle_outline_black_24dp.png b/src/main/res/drawable-hdpi/ic_help_circle_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..66c326231 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_help_circle_outline_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_help_circle_outline_black_24dp.png b/src/main/res/drawable-mdpi/ic_help_circle_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..e7f0d63b5 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_help_circle_outline_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_help_circle_outline_black_24dp.png b/src/main/res/drawable-xhdpi/ic_help_circle_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..82f8a1ab0 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_help_circle_outline_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_help_circle_outline_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_circle_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..3eb7065fe --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_help_circle_outline_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_help_circle_outline_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_help_circle_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..5838e0bbd --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_help_circle_outline_black_24dp.png diff --git a/src/main/res/layout/activity_enter_name.xml b/src/main/res/layout/activity_enter_name.xml index cb446479d..e98d55233 100644 --- a/src/main/res/layout/activity_enter_name.xml +++ b/src/main/res/layout/activity_enter_name.xml @@ -54,6 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:text="@string/next" android:textColor="?colorAccent" /> diff --git a/src/main/res/layout/activity_set_settings.xml b/src/main/res/layout/activity_set_settings.xml new file mode 100644 index 000000000..5560b6106 --- /dev/null +++ b/src/main/res/layout/activity_set_settings.xml @@ -0,0 +1,239 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:tools="http://schemas.android.com/tools" + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="http://schemas.android.com/apk/res-auto"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="@dimen/card_padding_regular"> + + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingBottom="@dimen/card_padding_regular" + android:text="@string/set_settings_intro" + android:textAppearance="@style/TextAppearance.Conversations.Subhead" /> + + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:shrinkColumns="0" + android:stretchColumns="0"> + + <TableRow + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="@dimen/card_padding_regular"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:ellipsize="end" + android:gravity="center_vertical" + android:text="@string/pref_screen_security" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <ImageButton + android:id="@+id/action_info_forbid_screenshots" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="?attr/icon_alpha" + android:background="?attr/selectableItemBackgroundBorderless" + android:gravity="center_vertical" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_help_circle_outline_black_24dp" /> + + <android.support.v7.widget.AppCompatCheckBox + android:id="@+id/forbid_screenshots" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:padding="@dimen/image_button_padding" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingBottom="@dimen/card_padding_regular"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:ellipsize="end" + android:gravity="center_vertical" + android:text="@string/pref_show_links_inside" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <ImageButton + android:id="@+id/action_info_show_weblinks" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="?attr/icon_alpha" + android:background="?attr/selectableItemBackgroundBorderless" + android:gravity="center_vertical" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_help_circle_outline_black_24dp" /> + + <android.support.v7.widget.AppCompatCheckBox + android:id="@+id/show_links" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingBottom="@dimen/card_padding_regular"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:ellipsize="end" + android:gravity="center_vertical" + android:text="@string/pref_show_mappreview_inside" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <ImageButton + android:id="@+id/action_info_show_map_previews" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="?attr/icon_alpha" + android:background="?attr/selectableItemBackgroundBorderless" + android:gravity="center_vertical" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_help_circle_outline_black_24dp" /> + + <android.support.v7.widget.AppCompatCheckBox + android:id="@+id/show_mappreview" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingBottom="@dimen/card_padding_regular"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:ellipsize="end" + android:gravity="center_vertical" + android:text="@string/pref_chat_states" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <ImageButton + android:id="@+id/action_info_chat_states" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="?attr/icon_alpha" + android:background="?attr/selectableItemBackgroundBorderless" + android:gravity="center_vertical" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_help_circle_outline_black_24dp" /> + + <android.support.v7.widget.AppCompatCheckBox + android:id="@+id/chat_states" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingBottom="@dimen/card_padding_regular"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:ellipsize="end" + android:gravity="center_vertical" + android:text="@string/pref_confirm_messages" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <ImageButton + android:id="@+id/action_info_confirm_messages" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="?attr/icon_alpha" + android:background="?attr/selectableItemBackgroundBorderless" + android:gravity="center_vertical" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_help_circle_outline_black_24dp" /> + + <android.support.v7.widget.AppCompatCheckBox + android:id="@+id/confirm_messages" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingBottom="@dimen/card_padding_regular"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:ellipsize="end" + android:gravity="center_vertical" + android:text="@string/pref_broadcast_last_activity" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <ImageButton + android:id="@+id/action_info_last_seen" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="?attr/icon_alpha" + android:background="?attr/selectableItemBackgroundBorderless" + android:gravity="center_vertical" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_help_circle_outline_black_24dp" /> + + <android.support.v7.widget.AppCompatCheckBox + android:id="@+id/last_seen" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" /> + </TableRow> + </TableLayout> + </LinearLayout> + + <Button + android:id="@+id/next" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + android:text="@string/next" + android:textColor="?colorAccent" /> + </RelativeLayout> + </ScrollView> + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/values/bools.xml b/src/main/res/values/bools.xml deleted file mode 100644 index f5d0a43b6..000000000 --- a/src/main/res/values/bools.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <bool name="prefer_xmpp_avatar">true</bool> - <bool name="show_links_inside">true</bool> -</resources>
\ No newline at end of file diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index e8e0c9206..dc4f7ead3 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -113,6 +113,10 @@ <bool name="quick_share_attachment_choice">true</bool> <bool name="screen_security">false</bool> <bool name="play_gif_inside">false</bool> + <bool name="prefer_xmpp_avatar">true</bool> + <bool name="show_links_inside">true</bool> + <bool name="show_maps_inside">true</bool> + <bool name="use_internal_updater">true</bool> <string-array name="domains"> <item>pix-art.de</item> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index d4dd1c5cf..00f199a0f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -110,7 +110,7 @@ <string name="pref_sound">Ringtone</string> <string name="pref_sound_summary">Play sound when a new message arrives</string> <string name="pref_send_crash">Send crash reports</string> - <string name="pref_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string> + <string name="pref_send_crash_summary">By sending stack traces you are helping the ongoing development of Pix-Art Messenger</string> <string name="pref_confirm_messages">Confirm Messages</string> <string name="pref_confirm_messages_summary">Let your contacts know when you have received and read their messages</string> <string name="pref_ui_options">UI</string> @@ -890,4 +890,9 @@ <string name="mgmt_account_password_forgotten">Password forgotten</string> <string name="password_forgotten_title">Password forgotten</string> <string name="password_forgotten_text">You have forgotten your account password? We will now try to open the support website of your provider.</string> + <string name="set_settings_intro">Here you can set some important privacy settings to your needs. All the settings can also be modified later.</string> + <string name="pref_show_mappreview_inside_summary">Show map previews directly inside the chat view</string> + <string name="pref_show_mappreview_inside">Show previews of locations in chat</string> + <string name="pref_use_internal_updater_summary">Let the messenger look for new app updates once a day</string> + <string name="pref_use_internal_updater">look for updates</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 15fe0fc34..069adc3e8 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -77,11 +77,6 @@ android:summary="@string/pref_play_gif_inside_summary" android:title="@string/pref_play_gif_inside" /> <CheckBoxPreference - android:defaultValue="@bool/show_links_inside" - android:key="show_links_inside" - android:summary="@string/pref_show_links_inside_summary" - android:title="@string/pref_show_links_inside" /> - <CheckBoxPreference android:defaultValue="@bool/prefer_xmpp_avatar" android:key="prefer_xmpp_avatar" android:summary="@string/pref_prefer_xmpp_avatar_summary" @@ -301,6 +296,21 @@ android:summary="@string/pref_broadcast_last_activity_summary" android:title="@string/pref_broadcast_last_activity" /> <CheckBoxPreference + android:defaultValue="@bool/use_internal_updater" + android:key="use_internal_updater" + android:summary="@string/pref_use_internal_updater_summary" + android:title="@string/pref_use_internal_updater" /> + <CheckBoxPreference + android:defaultValue="@bool/show_links_inside" + android:key="show_links_inside" + android:summary="@string/pref_show_links_inside_summary" + android:title="@string/pref_show_links_inside" /> + <CheckBoxPreference + android:defaultValue="@bool/show_maps_inside" + android:key="show_maps_inside" + android:summary="@string/pref_show_mappreview_inside_summary" + android:title="@string/pref_show_mappreview_inside" /> + <CheckBoxPreference android:defaultValue="@bool/warn_unencrypted_chat" android:key="warn_unencrypted_chat" android:summary="@string/pref_warn_unencrypted_chat_summary" |
