aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/anim/rotate_delta.xml9
-rw-r--r--app/src/main/res/layout/activity_tab_customizer.xml51
-rw-r--r--app/src/main/res/layout/iitem_tab_preview.xml23
-rw-r--r--app/src/main/res/layout/view_badged_icon.xml4
-rw-r--r--app/src/main/res/values-de-rDE/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-es-rES/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-fr-rFR/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-gl-rES/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-it-rIT/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-ko-rKR/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-pl-rPL/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-pt-rBR/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-vi-rVN/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values-zh-rCN/strings_pref_appearance.xml2
-rw-r--r--app/src/main/res/values/dimens.xml1
-rw-r--r--app/src/main/res/values/strings.xml3
-rw-r--r--app/src/main/res/values/strings_download.xml2
-rw-r--r--app/src/main/res/values/strings_errors.xml1
-rw-r--r--app/src/main/res/values/strings_pref_appearance.xml5
-rw-r--r--app/src/main/res/values/strings_pref_notifications.xml2
20 files changed, 107 insertions, 14 deletions
diff --git a/app/src/main/res/anim/rotate_delta.xml b/app/src/main/res/anim/rotate_delta.xml
new file mode 100644
index 00000000..99837e95
--- /dev/null
+++ b/app/src/main/res/anim/rotate_delta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="100"
+ android:fromDegrees="-5"
+ android:pivotX="50%"
+ android:pivotY="50%"
+ android:repeatCount="3"
+ android:repeatMode="reverse"
+ android:toDegrees="5" /> \ No newline at end of file
diff --git a/app/src/main/res/layout/activity_tab_customizer.xml b/app/src/main/res/layout/activity_tab_customizer.xml
new file mode 100644
index 00000000..b72bb953
--- /dev/null
+++ b/app/src/main/res/layout/activity_tab_customizer.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <View
+ android:id="@+id/pseudo_toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:elevation="0dp" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/tab_recycler"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <View
+ android:id="@+id/divider"
+ android:layout_width="match_parent"
+ android:layout_height="1dp" />
+
+ <TextView
+ android:id="@+id/instructions"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/kau_padding_normal"
+ android:text="@string/tab_customizer_instructions"
+ android:textAlignment="center" />
+
+ </LinearLayout>
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/fab_cancel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start|bottom"
+ android:layout_margin="@dimen/kau_fab_margin" />
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/fab_save"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end|bottom"
+ android:layout_margin="@dimen/kau_fab_margin" />
+
+</FrameLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/iitem_tab_preview.xml b/app/src/main/res/layout/iitem_tab_preview.xml
new file mode 100644
index 00000000..15e2ee7d
--- /dev/null
+++ b/app/src/main/res/layout/iitem_tab_preview.xml
@@ -0,0 +1,23 @@
+<?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:orientation="vertical"
+ android:padding="@dimen/kau_padding_normal">
+
+ <ImageView
+ android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:contentDescription=""
+ android:scaleType="center" />
+
+ <TextView
+ android:id="@+id/text"
+ style="@style/TextAppearance.AppCompat.Caption"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/kau_padding_small"
+ android:textAlignment="center" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/view_badged_icon.xml b/app/src/main/res/layout/view_badged_icon.xml
index c64e7809..4c6ca190 100644
--- a/app/src/main/res/layout/view_badged_icon.xml
+++ b/app/src/main/res/layout/view_badged_icon.xml
@@ -26,8 +26,8 @@
<ImageView
android:id="@+id/badge_image"
- android:layout_width="20dp"
- android:layout_height="20dp"
+ android:layout_width="@dimen/badge_icon_size"
+ android:layout_height="@dimen/badge_icon_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/values-de-rDE/strings_pref_appearance.xml b/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
index 33204db3..ecb4d6dc 100644
--- a/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
+++ b/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">Symbol Farbe</string>
<string name="global_customization">Globale Anpassung</string>
<string name="main_activity_layout">Haupt-Aktivitäten Layout</string>
- <string name="set_main_activity_layout">Setzte das Haupt-Aktivitäten Layout</string>
+ <string name="main_activity_layout_desc">Setzte das Haupt-Aktivitäten Layout</string>
<string name="rounded_icons">Runde Symbole</string>
<string name="rounded_icons_desc">Profilfotos und Gruppengespräch Symbole werden abgerundet</string>
<string name="tint_nav">Färbe Navigationsbar</string>
diff --git a/app/src/main/res/values-es-rES/strings_pref_appearance.xml b/app/src/main/res/values-es-rES/strings_pref_appearance.xml
index 8357f202..3603772c 100644
--- a/app/src/main/res/values-es-rES/strings_pref_appearance.xml
+++ b/app/src/main/res/values-es-rES/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">Color del icono</string>
<string name="global_customization">Personalización Global</string>
<string name="main_activity_layout">Diseño de la Pantalla Principal</string>
- <string name="set_main_activity_layout">Establecer Diseño de la Pantalla Principal</string>
+ <string name="main_activity_layout_desc">Establecer Diseño de la Pantalla Principal</string>
<string name="rounded_icons">Iconos redondeados</string>
<string name="rounded_icons_desc">Los iconos de conversación de grupo y fotos de perfil se redondearán</string>
<string name="tint_nav">Colorear Barra de Navegación</string>
diff --git a/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml b/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
index e23a8457..5e128669 100644
--- a/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">Couleur d\'icône</string>
<string name="global_customization">Personnalisation globale</string>
<string name="main_activity_layout">Disposition de l\'activité principale</string>
- <string name="set_main_activity_layout">Régler la disposition de l\'activité principale</string>
+ <string name="main_activity_layout_desc">Régler la disposition de l\'activité principale</string>
<string name="rounded_icons">Icônes rondes</string>
<string name="rounded_icons_desc">Les photos de profil et les icônes de conversation de groupe seront arrondis</string>
<string name="tint_nav">Teinter la barre de navigation</string>
diff --git a/app/src/main/res/values-gl-rES/strings_pref_appearance.xml b/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
index 0086a57f..752ff415 100644
--- a/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
+++ b/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">Cor das iconas</string>
<string name="global_customization">Personalización xeral</string>
<string name="main_activity_layout">Deseño da pantalla principal</string>
- <string name="set_main_activity_layout">Define o deseño da pantalla principal</string>
+ <string name="main_activity_layout_desc">Define o deseño da pantalla principal</string>
<string name="rounded_icons">Iconas arredondadas</string>
<string name="rounded_icons_desc">As fotos dos perfís e as iconas de conversas en grupo serán redondas</string>
<string name="tint_nav">Cor da barra de navegación</string>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_appearance.xml b/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
index e86fd73a..1204257a 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">Colore dell\'Icona</string>
<string name="global_customization">Personalizzazione Globale</string>
<string name="main_activity_layout">Layout Pagina Principale</string>
- <string name="set_main_activity_layout">Imposta Layout</string>
+ <string name="main_activity_layout_desc">Imposta Layout</string>
<string name="rounded_icons">Icone Arrotondate</string>
<string name="rounded_icons_desc">Le immagini profilo e le conversazioni di gruppo saranno arrotondate</string>
<string name="tint_nav">Barra di Navigazione in tinta</string>
diff --git a/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml b/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
index dbb3ada7..b1b51c78 100644
--- a/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">아이콘 색상</string>
<string name="global_customization">전역 사용자 지정</string>
<string name="main_activity_layout">주 액티비티 구성</string>
- <string name="set_main_activity_layout">주 액티비티 구성으로 설정</string>
+ <string name="main_activity_layout_desc">주 액티비티 구성으로 설정</string>
<string name="rounded_icons">원형 아이콘</string>
<string name="rounded_icons_desc">프로필 사진과 그룹 대화 아이콘이 둥글어 집니다.</string>
<string name="tint_nav">내비게이션 바 색상</string>
diff --git a/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml b/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
index 23d04210..6e950ddd 100644
--- a/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
+++ b/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">Kolor ikon</string>
<string name="global_customization">Ogólne dostosowanie</string>
<string name="main_activity_layout">Układ aktywności</string>
- <string name="set_main_activity_layout">Ustaw układ aktywności</string>
+ <string name="main_activity_layout_desc">Ustaw układ aktywności</string>
<string name="rounded_icons">Okrągłe ikony</string>
<string name="rounded_icons_desc">Zdjęcia profilowe i ikony konwersacji grupowych zostaną zaokrąglone</string>
<string name="tint_nav">Koloruj pasek nawigacji</string>
diff --git a/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml b/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
index a18c18d1..8a987481 100644
--- a/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">Cor dos ícones</string>
<string name="global_customization">Personalização geral</string>
<string name="main_activity_layout">Layout da atividade principal</string>
- <string name="set_main_activity_layout">Definir o layout das abas principais</string>
+ <string name="main_activity_layout_desc">Definir o layout das abas principais</string>
<string name="rounded_icons">Ícones Arredondados</string>
<string name="rounded_icons_desc">Fotos de perfil e ícones de conversas em grupo serão arredondados</string>
<string name="tint_nav">Cor da Barra de Navegação</string>
diff --git a/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml b/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
index d479a0dc..3cbc484e 100644
--- a/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
+++ b/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">Màu biểu tượng</string>
<string name="global_customization">Tuỳ chỉnh chung</string>
<string name="main_activity_layout">Giao diện màn hình chính</string>
- <string name="set_main_activity_layout">Đặt giao diện màn hình chính</string>
+ <string name="main_activity_layout_desc">Đặt giao diện màn hình chính</string>
<string name="rounded_icons">Làm tròn biểu tượng</string>
<string name="rounded_icons_desc">Ảnh đại diện và biểu tượng hội thoại nhóm sẽ được làm tròn</string>
<string name="tint_nav">Đổi màu thanh điều hướng</string>
diff --git a/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml b/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
index 9c52e86e..cdb3015a 100644
--- a/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
+++ b/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
@@ -10,7 +10,7 @@
<string name="icon_color">图标颜色</string>
<string name="global_customization">全局定制</string>
<string name="main_activity_layout">主要活动布局</string>
- <string name="set_main_activity_layout">设置主要活动布局</string>
+ <string name="main_activity_layout_desc">设置主要活动布局</string>
<string name="rounded_icons">圆形图标</string>
<string name="rounded_icons_desc">圆形图标说明</string>
<string name="tint_nav">淡色导航栏</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 888340e9..3d03888e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,4 +7,5 @@
<dimen name="tab_bar_height">50dp</dimen>
<dimen name="intro_bar_height">64dp</dimen>
+ <dimen name="badge_icon_size">20dp</dimen>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e1d3c530..540ee0da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,5 +54,8 @@
<string name="bottom_bar">Bottom Bar</string>
<string name="pip" translatable="false">PIP</string>
+ <string name="preview">Preview</string>
+ <string name="options">Options</string>
+ <string name="tab_customizer_instructions">Long press and drag to rearrange the top icons.</string>
</resources>
diff --git a/app/src/main/res/values/strings_download.xml b/app/src/main/res/values/strings_download.xml
index c0cb8cd4..5a1e3fa7 100644
--- a/app/src/main/res/values/strings_download.xml
+++ b/app/src/main/res/values/strings_download.xml
@@ -11,4 +11,6 @@
<string name="downloaded_video">Video Downloaded</string>
<string name="downloading_file">Downloading File</string>
<string name="downloaded_file">File Downloaded</string>
+
+ <string name="error_invalid_download">Invalid download attempt</string>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/strings_errors.xml b/app/src/main/res/values/strings_errors.xml
index 88428652..173ed58e 100644
--- a/app/src/main/res/values/strings_errors.xml
+++ b/app/src/main/res/values/strings_errors.xml
@@ -6,4 +6,5 @@
<string name="invalid_share_url_desc">You have shared a block of text that is not a url. The text has been copied to your clipboard, so you may share it manually yourself.</string>
<string name="no_download_manager">No Download Manager</string>
<string name="no_download_manager_desc">The download manager is not enabled. Would you like to enable it to allow downloads?</string>
+ <string name="error_generic">An error occurred.</string>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/strings_pref_appearance.xml b/app/src/main/res/values/strings_pref_appearance.xml
index f2e0f9e0..a179b096 100644
--- a/app/src/main/res/values/strings_pref_appearance.xml
+++ b/app/src/main/res/values/strings_pref_appearance.xml
@@ -13,7 +13,10 @@
<string name="global_customization">Global Customization</string>
<string name="main_activity_layout">Main Activity Layout</string>
- <string name="set_main_activity_layout">Set Main Activity Layout</string>
+ <string name="main_activity_layout_desc">Set Main Activity Layout</string>
+
+ <string name="main_tabs">Main Activity Tabs</string>
+ <string name="main_tabs_desc">Customize which tabs you\'ll see in your main activity</string>
<string name="rounded_icons">Rounded Icons</string>
<string name="rounded_icons_desc">Profile photos and group conversation icons will be rounded</string>
diff --git a/app/src/main/res/values/strings_pref_notifications.xml b/app/src/main/res/values/strings_pref_notifications.xml
index 61c8c598..49665f8e 100644
--- a/app/src/main/res/values/strings_pref_notifications.xml
+++ b/app/src/main/res/values/strings_pref_notifications.xml
@@ -22,7 +22,7 @@
<string name="notification_ringtone">Notification Ringtone</string>
<string name="message_ringtone">Message Ringtone</string>
- <string name="select_ringtone">Selet Ringtone</string>
+ <string name="select_ringtone">Select Ringtone</string>
<string name="notification_vibrate">Notification vibration</string>
<string name="notification_lights">Notification lights</string>