diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/ic_baseline_insert_emoticon_24.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/drawable/ic_baseline_notes_24.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/drawable/ic_baseline_translate_24.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_instance.xml | 101 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_release_note.xml | 86 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_status_compose.xml | 17 | ||||
| -rw-r--r-- | app/src/main/res/layout/popup_release_notes.xml | 111 | ||||
| -rw-r--r-- | app/src/main/res/menu/activity_main_drawer.xml | 153 | ||||
| -rw-r--r-- | app/src/main/res/menu/main.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values-sc/strings.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values-tr/strings.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/xml/pref_timelines.xml | 2 |
13 files changed, 416 insertions, 105 deletions
diff --git a/app/src/main/res/drawable/ic_baseline_insert_emoticon_24.xml b/app/src/main/res/drawable/ic_baseline_insert_emoticon_24.xml index 51f988778..cb1fa12ff 100644 --- a/app/src/main/res/drawable/ic_baseline_insert_emoticon_24.xml +++ b/app/src/main/res/drawable/ic_baseline_insert_emoticon_24.xml @@ -1,7 +1,7 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" - android:tint="#FFFFFF" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path diff --git a/app/src/main/res/drawable/ic_baseline_notes_24.xml b/app/src/main/res/drawable/ic_baseline_notes_24.xml new file mode 100644 index 000000000..5b99d33d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_notes_24.xml @@ -0,0 +1,11 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:autoMirrored="true" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M3,18h12v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h18v-2L3,11v2z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_baseline_translate_24.xml b/app/src/main/res/drawable/ic_baseline_translate_24.xml new file mode 100644 index 000000000..4b6b9b369 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_translate_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z" /> +</vector> diff --git a/app/src/main/res/layout/activity_instance.xml b/app/src/main/res/layout/activity_instance.xml index 790c0c630..8661017bc 100644 --- a/app/src/main/res/layout/activity_instance.xml +++ b/app/src/main/res/layout/activity_instance.xml @@ -16,37 +16,32 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="350dp"> + android:layout_height="wrap_content"> - <RelativeLayout + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="wrap_content" + android:id="@+id/main_container" + android:layout_height="420dp" android:padding="@dimen/fab_margin" android:paddingLeft="@dimen/drawer_padding" android:paddingRight="@dimen/drawer_padding"> - <RelativeLayout + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/background" android:layout_width="match_parent" - android:layout_height="300dp" - android:alpha="0.2"> - - <ImageView - android:id="@+id/back_ground_image" - android:layout_width="match_parent" - android:layout_height="300dp" - android:contentDescription="@string/logo_of_the_instance" - android:scaleType="centerCrop" /> - </RelativeLayout> + android:layout_height="match_parent" /> - <LinearLayout + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_height="300dp" android:id="@+id/instance_container" android:layout_width="match_parent" - android:layout_height="match_parent" + app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="20dp" android:orientation="vertical"> <!-- Instance title --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/instance_title" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -55,7 +50,7 @@ android:textSize="20sp" /> <!-- Instance description --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/instance_description" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -64,7 +59,7 @@ android:gravity="center_horizontal" android:textSize="16sp" /> - <LinearLayout + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" @@ -72,7 +67,7 @@ android:gravity="center" android:orientation="horizontal"> <!-- Instance version --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/instance_version" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -80,7 +75,7 @@ android:textSize="14sp" android:textStyle="italic" /> <!-- Instance URI --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/instance_uri" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -88,24 +83,48 @@ android:gravity="center_horizontal" android:textSize="14sp" android:textStyle="italic" /> - </LinearLayout> + </androidx.appcompat.widget.LinearLayoutCompat> + + + + + </androidx.appcompat.widget.LinearLayoutCompat> + + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/max_char_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:visibility="gone" + app:layout_constraintTop_toBottomOf="@+id/instance_container" + tools:visibility="visible"> + + <androidx.appcompat.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/set_your_max_char_count" + android:textSize="18sp" /> - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/instance_contact" + <androidx.appcompat.widget.AppCompatEditText + android:id="@+id/max_char" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_margin="@dimen/fab_margin" - android:contentDescription="@string/contact_instance_admin" - android:src="@drawable/ic_baseline_mail_outline_24" - app:backgroundTint="@color/cyanea_accent_dark_reference" /> - </LinearLayout> + android:layout_marginStart="10dp" + android:hint="500" + android:inputType="number" + android:textSize="18sp" + tools:ignore="HardcodedText" /> + </androidx.appcompat.widget.LinearLayoutCompat> + <!-- Main Loader --> <RelativeLayout android:id="@+id/loader" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="420dp" android:gravity="center" + tools:visibility="visible" android:visibility="gone"> <ProgressBar @@ -114,7 +133,23 @@ android:indeterminate="true" /> </RelativeLayout> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/instance_contact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|end" + android:layout_margin="@dimen/fab_margin" + android:contentDescription="@string/contact_instance_admin" + android:src="@drawable/ic_baseline_mail_outline_24" + app:backgroundTint="@color/cyanea_accent_dark_reference" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> + <androidx.appcompat.widget.AppCompatButton + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/max_char_container" android:id="@+id/close" style="@style/Widget.AppCompat.Button.Colored" android:layout_width="wrap_content" @@ -122,10 +157,10 @@ android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" android:layout_gravity="center" - android:layout_marginTop="20dp" android:text="@string/close" android:textAllCaps="false" android:textColor="@color/white" android:textSize="16sp" /> - </RelativeLayout> + + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/drawer_release_note.xml b/app/src/main/res/layout/drawer_release_note.xml new file mode 100644 index 000000000..168d5db28 --- /dev/null +++ b/app/src/main/res/layout/drawer_release_note.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/version" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:lines="1" + android:padding="2dp" + android:textSize="18sp" + android:textStyle="bold" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/note" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="5dp" + android:textSize="16sp" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/translate" + style="@style/Widget.App.Button.IconOnly.Outline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:contentDescription="@string/translate" + app:icon="@drawable/ic_baseline_translate_24" + app:iconPadding="0dp" /> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/container_trans" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="6dp" + android:layout_marginTop="6dp" + android:layout_marginEnd="6dp" + android:orientation="vertical" + android:visibility="gone"> + + <View + android:id="@+id/translation_border_view" + android:layout_width="match_parent" + android:layout_height="0dp" + android:background="@drawable/translation_border" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/translation_border_top" /> + + <androidx.constraintlayout.widget.Placeholder + android:id="@+id/translation_border_top" + android:layout_width="wrap_content" + android:layout_height="1dp" + app:layout_constraintBottom_toBottomOf="@id/translation_label" + app:layout_constraintEnd_toEndOf="@id/translation_label" + app:layout_constraintTop_toTopOf="@id/translation_label" /> + + <TextView + android:id="@+id/translation_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="10dp" + android:background="?backgroundColorLight" + android:paddingStart="2dp" + android:paddingEnd="2dp" + android:text="@string/translation" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/note_translated" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="4dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="4dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/translation_label" + app:layout_goneMarginBottom="8dp" /> + + </androidx.constraintlayout.widget.ConstraintLayout> +</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file diff --git a/app/src/main/res/layout/drawer_status_compose.xml b/app/src/main/res/layout/drawer_status_compose.xml index 550c1e21a..802ec5c61 100644 --- a/app/src/main/res/layout/drawer_status_compose.xml +++ b/app/src/main/res/layout/drawer_status_compose.xml @@ -147,6 +147,19 @@ app:layout_constraintStart_toEndOf="@id/button_visibility" app:layout_constraintTop_toBottomOf="@id/text_area_divider" /> + <androidx.appcompat.widget.AppCompatImageButton + android:id="@+id/button_emoji_one" + style="@style/Widget.AppCompat.Button.Borderless.Colored" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginTop="6dp" + android:contentDescription="@string/emoji_picker" + android:src="@drawable/ic_baseline_insert_emoticon_24" + android:visibility="gone" + app:layout_constraintStart_toEndOf="@id/button_emoji" + app:layout_constraintTop_toBottomOf="@id/text_area_divider" + tools:visibility="visible" /> + <com.google.android.material.textview.MaterialTextView android:id="@+id/character_count" android:layout_width="wrap_content" @@ -155,7 +168,7 @@ android:text="0" app:layout_constraintBottom_toTopOf="@id/character_progress" app:layout_constraintEnd_toStartOf="@id/button_post" - app:layout_constraintStart_toEndOf="@id/button_emoji" + app:layout_constraintStart_toEndOf="@id/button_emoji_one" app:layout_constraintTop_toBottomOf="@id/text_area_divider" app:layout_constraintVertical_chainStyle="packed" tools:ignore="HardcodedText" /> @@ -167,7 +180,7 @@ android:layout_height="12dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/button_post" - app:layout_constraintStart_toEndOf="@id/button_emoji" + app:layout_constraintStart_toEndOf="@id/button_emoji_one" app:layout_constraintTop_toBottomOf="@id/character_count" /> <androidx.appcompat.widget.AppCompatImageButton diff --git a/app/src/main/res/layout/popup_release_notes.xml b/app/src/main/res/layout/popup_release_notes.xml new file mode 100644 index 000000000..3156a61b5 --- /dev/null +++ b/app/src/main/res/layout/popup_release_notes.xml @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Copyright 2022 Thomas Schneider + + This file is a part of Fedilab + + This program is free software; you can redistribute it and/or modify it under the terms of the + GNU General Public License as published by the Free Software Foundation; either version 3 of the + License, or (at your option) any later version. + + Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + Public License for more details. + + You should have received a copy of the GNU General Public License along with Fedilab; if not, + see <http://www.gnu.org/licenses>. +--> + +<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/releasenotes" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_margin="5dp" + android:layout_weight="1" /> + + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/acccount_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" + android:orientation="horizontal" + android:visibility="invisible" + app:layout_constraintBottom_toTopOf="@+id/about_support" + tools:visibility="visible"> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/account_pp" + android:layout_width="60dp" + android:layout_height="60dp" + android:layout_margin="10dp" + android:contentDescription="@string/profile_picture" /> + + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical" + android:padding="10dp"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/account_dn" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.AppCompat.Body1" + android:textSize="16sp" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/account_un" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.AppCompat.Body1" + android:textSize="14sp" /> + </androidx.appcompat.widget.LinearLayoutCompat> + + + <androidx.appcompat.widget.AppCompatImageButton + android:id="@+id/account_follow" + style="@style/Widget.AppCompat.Button.Colored" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_margin="10dp" + android:contentDescription="@string/make_an_action" + android:scaleType="fitCenter" + android:tint="@color/white" + android:visibility="gone" + app:layout_constraintStart_toEndOf="@id/avatar_container" + app:layout_constraintTop_toBottomOf="@id/banner_container" + tools:src="@drawable/ic_baseline_person_add_24" + tools:visibility="visible" /> + + </androidx.appcompat.widget.LinearLayoutCompat> + + <com.google.android.material.button.MaterialButton + android:id="@+id/about_support" + style="@style/Widget.MaterialComponents.Button.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="10dp" + android:text="@string/support_the_app_on_liberapay" + android:textColor="@color/cyanea_accent_dark_reference" + app:strokeColor="@color/cyanea_accent_dark_reference" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/about_support_paypal" + style="@style/Widget.MaterialComponents.Button.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="PayPal" + android:textColor="@color/cyanea_accent_dark_reference" + app:strokeColor="@color/cyanea_accent_dark_reference" + tools:ignore="HardcodedText" /> +</androidx.appcompat.widget.LinearLayoutCompat> diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 4ab3fc405..21f0af4cc 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -3,74 +3,103 @@ xmlns:tools="http://schemas.android.com/tools" tools:showIn="navigation_view"> - <group android:checkableBehavior="single"> - - <item - android:id="@+id/nav_drafts" - android:icon="@drawable/ic_baseline_drafts_24" - android:title="@string/drafts" /> - <item - android:id="@+id/nav_reorder" - android:icon="@drawable/ic_baseline_reorder_24" - android:title="@string/reorder_timelines" /> - + <group> <item - android:id="@+id/nav_interactions" - android:icon="@drawable/ic_baseline_supervised_user_circle_24" - android:title="@string/interactions" /> - + android:id="@+id/nav_main_com" + android:title="@string/my_account"> + <menu> + <group android:checkableBehavior="single"> + <item + android:id="@+id/nav_drafts" + android:icon="@drawable/ic_baseline_drafts_24" + android:title="@string/drafts" /> + <item + android:id="@+id/nav_interactions" + android:icon="@drawable/ic_baseline_supervised_user_circle_24" + android:title="@string/interactions" /> + <item + android:id="@+id/nav_filter" + android:icon="@drawable/ic_baseline_filter_list_24" + android:title="@string/filters" /> + <item + android:id="@+id/nav_list" + android:icon="@drawable/ic_baseline_view_list_24" + android:title="@string/action_lists" /> + <item + android:id="@+id/nav_follow_requests" + android:icon="@drawable/ic_baseline_group_add_24" + android:title="@string/follow_request" + android:visible="false" /> + <item + android:id="@+id/nav_administration" + android:icon="@drawable/ic_baseline_admin_panel_settings_24" + android:title="@string/administration" + android:visible="false" /> + </group> + </menu> + </item> <item - android:id="@+id/nav_filter" - android:icon="@drawable/ic_baseline_filter_list_24" - android:title="@string/filters" /> + android:id="@+id/nav_instance" + android:title="@string/my_instance"> + <menu> + <group android:checkableBehavior="single"> + <item + android:id="@+id/nav_announcements" + android:icon="@drawable/ic_baseline_message_24" + android:title="@string/action_announcements" + android:visible="true" /> - <item - android:id="@+id/nav_list" - android:icon="@drawable/ic_baseline_view_list_24" - android:title="@string/action_lists" /> + <item + android:id="@+id/nav_trends" + android:icon="@drawable/ic_baseline_trending_up_24" + android:title="@string/trending" + android:visible="true" /> - <item - android:id="@+id/nav_announcements" - android:icon="@drawable/ic_baseline_message_24" - android:title="@string/action_announcements" - android:visible="true" /> + <item + android:id="@+id/nav_about_instance" + android:icon="@drawable/ic_info_outline_white_24dp" + android:title="@string/action_about_instance" + android:visible="true" /> + </group> + </menu> + </item> <item - android:id="@+id/nav_trends" - android:icon="@drawable/ic_baseline_trending_up_24" - android:title="@string/trending" - android:visible="true" /> + android:id="@+id/nav_app" + android:title="@string/my_app"> + <menu> + <group android:checkableBehavior="single"> + <item + android:id="@+id/nav_reorder" + android:icon="@drawable/ic_baseline_reorder_24" + android:title="@string/reorder_timelines" /> + <item + android:id="@+id/nav_scheduled" + android:icon="@drawable/ic_baseline_schedule_24" + android:title="@string/scheduled" /> + <item + android:id="@+id/nav_settings" + android:icon="@drawable/ic_baseline_settings_24" + android:title="@string/settings" /> + <item + android:id="@+id/nav_cache" + android:icon="@drawable/ic_baseline_cached_24" + android:title="@string/action_cache" /> + <item + android:id="@+id/nav_about" + android:icon="@drawable/ic_baseline_info_24" + android:title="@string/action_about" /> + <item + android:id="@+id/nav_release_notes" + android:icon="@drawable/ic_baseline_notes_24" + android:title="@string/release_notes" /> + <item + android:id="@+id/nav_partnership" + android:icon="@drawable/ic_baseline_account_circle_24" + android:title="@string/action_partnership" /> + </group> + </menu> + </item> - <item - android:id="@+id/nav_scheduled" - android:icon="@drawable/ic_baseline_schedule_24" - android:title="@string/scheduled" /> - <item - android:id="@+id/nav_follow_requests" - android:icon="@drawable/ic_baseline_group_add_24" - android:title="@string/follow_request" - android:visible="false" /> - <item - android:id="@+id/nav_administration" - android:icon="@drawable/ic_baseline_admin_panel_settings_24" - android:title="@string/administration" - android:visible="false" /> - <item - android:id="@+id/nav_settings" - android:icon="@drawable/ic_baseline_settings_24" - android:title="@string/settings" /> - <item - android:id="@+id/nav_cache" - android:icon="@drawable/ic_baseline_cached_24" - android:title="@string/action_cache" /> - <item - android:id="@+id/nav_about" - android:icon="@drawable/ic_baseline_info_24" - android:title="@string/action_about" /> - - <item - android:id="@+id/nav_partnership" - android:icon="@drawable/ic_baseline_account_circle_24" - android:title="@string/action_partnership" /> </group> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index cbdc71173..b1dda381f 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -1,11 +1,8 @@ <?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_about_instance" - android:title="@string/action_about_instance" - app:showAsAction="never" /> - <item + +<item android:id="@+id/action_proxy" android:title="@string/proxy_set" app:showAsAction="never" /> diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 59ce3110c..8d6429f5e 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -721,4 +721,9 @@ <string name="delete_cache_message">Ses seguru de bòlere isboidare sa memòria temporànea\? Si tenes abbotzos cun cuntenutos multimediales as a pèrdere sos cuntenutos alligados.</string> <string name="clear_cache">Isbòida sa memòria temporànea</string> <string name="default_system_language">Imprea sa limba predefinida de sistema</string> + <string name="message_language">Limba pro sos messàgios</string> + <string name="my_instance">S\'istàntzia mea</string> + <string name="my_app">S\'aplicatzione mea</string> + <string name="set_your_max_char_count">Imposta su nùmeru màssimu de caràteres tuo</string> + <string name="my_account">Su contu meu</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 37cb1b2d8..9141f5f45 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -727,4 +727,9 @@ <string name="messages_in_cache_for_other_timelines">Diğer zaman çizelgeleri için önbellekteki mesajlar</string> <string name="messages_stored_in_drafts">Taslaklarda saklanan mesajlar</string> <string name="default_system_language">Öntanımlı sistem dilini kullan</string> + <string name="message_language">Mesajlar için dil</string> + <string name="my_instance">Sunucum</string> + <string name="my_app">Uygulamam</string> + <string name="my_account">Hesabım</string> + <string name="set_your_max_char_count">Azami karakter sayınızı ayarlayın</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 294cd3a23..4aafed3f8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -848,7 +848,7 @@ </string-array> - <string name="SET_LONG_PRESS_MEDIA" translatable="false">SET_LONG_PRESS_MEDIA</string> + <string name="SET_LONG_PRESS_STORE_MEDIA" translatable="false">SET_LONG_PRESS_STORE_MEDIA</string> <string name="SET_UNFOLLOW_VALIDATION" translatable="false">SET_UNFOLLOW_VALIDATION</string> <string name="SET_DISPLAY_ADMIN_STATUSES" translatable="false">SET_DISPLAY_ADMIN_STATUSES</string> <string name="SET_LED_COLOUR_VAL" translatable="false">SET_LED_COLOUR_VAL</string> @@ -922,6 +922,10 @@ <string name="REPLACE_WIKIPEDIA_HOST" translatable="false">REPLACE_WIKIPEDIA_HOST</string> <string name="DEFAULT_REPLACE_WIKIPEDIA_HOST" translatable="false">wikiless.org</string> <string name="LAST_NOTIFICATION_ID" translatable="false">LAST_NOTIFICATION_ID</string> + <string name="SET_MAX_INSTANCE_CHAR" translatable="false">SET_MAX_INSTANCE_CHAR</string> + <string name="SET_POPUP_RELEASE_NOTES" translatable="false">SET_POPUP_RELEASE_NOTES</string> + + <string name="type_of_notifications">Type of notifications</string> <string name="type_of_notifications_title">Chose the type of notifications</string> <string name="notification_sounds">Notification sounds</string> @@ -982,6 +986,11 @@ <string name="delete_cache_message">Are you sure you want to delete cache? If you have drafts with media, the attached media will be lost.</string> <string name="default_system_language">Use the default system language</string> <string name="message_language">Language for messages</string> + <string name="my_instance">My instance</string> + <string name="my_app">My app</string> + <string name="my_account">My account</string> + <string name="set_your_max_char_count">Set your max char count</string> + <string name="release_notes">Release notes</string> <string-array name="photo_editor_emoji" translatable="false"> <!-- Smiles --> diff --git a/app/src/main/res/xml/pref_timelines.xml b/app/src/main/res/xml/pref_timelines.xml index 1b9a9c738..bf408875c 100644 --- a/app/src/main/res/xml/pref_timelines.xml +++ b/app/src/main/res/xml/pref_timelines.xml |