Merge branch 'dev'
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
~
|
||||
-->
|
||||
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<RelativeLayout 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:id="@+id/coordinator"
|
||||
@@ -25,55 +25,40 @@
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".view.ui.search.SearchResultsFragment">
|
||||
|
||||
<RelativeLayout
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
app:menu="@menu/menu_search"
|
||||
app:navigationIcon="@drawable/ic_arrow_back">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/searchBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="42dp"
|
||||
android:background="@null"
|
||||
android:hint="@string/search_hint"
|
||||
android:imeOptions="flagNoExtractUi|actionSearch"
|
||||
android:inputType="text"
|
||||
android:paddingStart="@dimen/padding_large"
|
||||
android:paddingEnd="@dimen/padding_normal"
|
||||
android:singleLine="true" />
|
||||
</androidx.appcompat.widget.Toolbar>
|
||||
|
||||
<com.google.android.material.divider.MaterialDivider
|
||||
android:id="@+id/divider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/toolbar" />
|
||||
|
||||
<com.airbnb.epoxy.EpoxyRecyclerView
|
||||
android:id="@+id/recycler"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
app:menu="@menu/menu_search"
|
||||
app:navigationIcon="@drawable/ic_arrow_back">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/searchBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="42dp"
|
||||
android:background="@null"
|
||||
android:hint="@string/search_hint"
|
||||
android:imeOptions="flagNoExtractUi|actionSearch"
|
||||
android:inputType="text"
|
||||
android:paddingStart="@dimen/padding_large"
|
||||
android:paddingEnd="@dimen/padding_normal"
|
||||
android:singleLine="true" />
|
||||
</androidx.appcompat.widget.Toolbar>
|
||||
|
||||
<com.google.android.material.divider.MaterialDivider
|
||||
android:id="@+id/divider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/toolbar" />
|
||||
|
||||
<com.airbnb.epoxy.EpoxyRecyclerView
|
||||
android:id="@+id/recycler"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_below="@+id/divider"
|
||||
android:clipToPadding="true"
|
||||
android:paddingTop="@dimen/padding_normal"
|
||||
android:paddingBottom="@dimen/height_bottom_adj"
|
||||
tools:listitem="@layout/view_app_list" />
|
||||
</RelativeLayout>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
|
||||
android:id="@+id/filter_fab"
|
||||
style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Primary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal|bottom"
|
||||
android:text="@string/action_filter"
|
||||
app:icon="@drawable/ic_filter" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
android:layout_below="@+id/divider"
|
||||
android:clipToPadding="true"
|
||||
android:paddingTop="@dimen/padding_normal"
|
||||
android:paddingBottom="@dimen/height_bottom_adj"
|
||||
tools:listitem="@layout/view_app_list" />
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -188,7 +188,7 @@
|
||||
<string name="device_miui_description">"Please, disable MIUI optimizations to allow installations, otherwise you can choose Root or Services installer."</string>
|
||||
<string name="device_miui_extra">"Optionally you can choose Native installer, but then you can not install bundled (split) APKs, so choice is yours."</string>
|
||||
<string name="dialog_title_self_update">"New update available"</string>
|
||||
<string name="dialog_desc_native_split">"You can not install bundled(split) apps via Native Installer. Change your installer to Session, Services or Root."</string>
|
||||
<string name="dialog_desc_native_split">"You can not install bundled (split) apps via Native Installer. Change your installer to Session, Services or Root."</string>
|
||||
<string name="notification_channel_account">Account-related notification</string>
|
||||
<string name="notification_channel_export">App export notification</string>
|
||||
<string name="notification_channel_install">Install notification</string>
|
||||
@@ -437,7 +437,7 @@
|
||||
<string name="export_app_title">File exporter</string>
|
||||
<string name="export_app_summary">Hold on, exporting your file</string>
|
||||
<string name="export_app_summary_success">Successfully exported app bundle</string>
|
||||
<string name="export_app_summary_fail">Failed to exported app bundle</string>
|
||||
<string name="export_app_summary_fail">Failed to export app bundle</string>
|
||||
|
||||
<!-- LogoutDialog -->
|
||||
<string name="action_logout_confirmation_title">Log out?</string>
|
||||
@@ -490,8 +490,8 @@
|
||||
<string name="installed_apps_size"><xliff:g id="installed_apps_size">%1$d</xliff:g> apps installed</string>
|
||||
|
||||
<!-- NetworkPreference -->
|
||||
<string name="pref_network_microg_login_title">Use microG to sign-in to accounts</string>
|
||||
<string name="pref_network_microg_login_desc">Authenticate using microG when signing into Google accounts for a simpler sign-in flow.</string>
|
||||
<string name="pref_network_microg_login_title">Use microG to sign in to accounts</string>
|
||||
<string name="pref_network_microg_login_desc">Authenticate using microG when signing into Google accounts for a simpler sign-in flow</string>
|
||||
<string name="set">Set</string>
|
||||
<string name="disable">Disable</string>
|
||||
<string name="toast_proxy_disabled">Proxy disabled successfully</string>
|
||||
|
||||
Reference in New Issue
Block a user