Merge branch 'master' of https://github.com/commons-app/apps-android-commons into category-alignment

This commit is contained in:
Suchit Kar 2018-02-27 19:58:33 +05:30
commit ad9740154f
117 changed files with 1997 additions and 628 deletions

View file

@ -1,33 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/fragmentCategorisationBackground"
android:clickable="true"
android:focusableInTouchMode="true"
android:orientation="vertical"
android:paddingBottom="@dimen/small_gap"
android:paddingLeft="@dimen/standard_gap"
android:paddingStart="@dimen/standard_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingEnd="@dimen/standard_gap"
android:paddingLeft="@dimen/standard_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingStart="@dimen/standard_gap"
android:paddingTop="@dimen/small_gap"
android:theme="@style/DarkAppTheme"
>
android:theme="@style/DarkAppTheme">
<FrameLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
>
android:layout_height="wrap_content"
android:clickable="true"
android:focusableInTouchMode="true">
<EditText
android:id="@+id/categoriesSearchBox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/categories_search_text_hint"
android:maxLines="1"
android:gravity="left"
android:inputType="textCapWords"
android:imeOptions="flagNoExtractUi"
/>
android:imeOptions="flagNoExtractUi"/>
<ProgressBar
android:id="@+id/categoriesSearchInProgress"
@ -45,27 +46,24 @@
<TextView
android:id="@+id/categoriesNotFound"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="wrap_content"
android:gravity="center"
/>
android:visibility="gone" />
<TextView
android:id="@+id/categoriesExplanation"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/huge_gap"
android:gravity="center"
android:focusable="true"
android:gravity="center"
android:text="@string/categories_skip_explanation"
android:visibility="gone"
/>
android:visibility="gone" />
<android.support.v7.widget.RecyclerView
android:id="@+id/categoriesListBox"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:fadingEdge="none"
/>
android:layout_height="wrap_content"
android:fadingEdge="none" />
</LinearLayout>