|
|
@ -1,5 +1,5 @@ |
|
|
|
<?xml version="1.0" encoding="utf-8"?> |
|
|
|
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" |
|
|
|
<androidx.coordinatorlayout.widget.CoordinatorLayout 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/main_content" |
|
|
@ -8,22 +8,22 @@ |
|
|
|
android:fitsSystemWindows="true" |
|
|
|
tools:context=".activities.upload.UploadActivity"> |
|
|
|
|
|
|
|
<android.support.design.widget.AppBarLayout |
|
|
|
<com.google.android.material.appbar.AppBarLayout |
|
|
|
android:id="@+id/appbar" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="wrap_content" |
|
|
|
android:paddingTop="@dimen/appbar_padding_top" |
|
|
|
android:theme="@style/ToolbarTheme"> |
|
|
|
|
|
|
|
<android.support.v7.widget.Toolbar |
|
|
|
<androidx.appcompat.widget.Toolbar |
|
|
|
android:id="@+id/toolbar" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="?attr/actionBarSize" |
|
|
|
android:background="?attr/colorPrimary" |
|
|
|
app:popupTheme="@style/ToolbarTheme" /> |
|
|
|
</android.support.design.widget.AppBarLayout> |
|
|
|
</com.google.android.material.appbar.AppBarLayout> |
|
|
|
|
|
|
|
<android.support.v4.widget.NestedScrollView |
|
|
|
<androidx.core.widget.NestedScrollView |
|
|
|
android:id="@+id/upload_outer_scrollview" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="match_parent" |
|
|
@ -58,7 +58,7 @@ |
|
|
|
android:prompt="@string/upload_spinners_hint" /> |
|
|
|
</LinearLayout> |
|
|
|
|
|
|
|
<android.support.design.widget.TextInputLayout |
|
|
|
<com.google.android.material.textfield.TextInputLayout |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="wrap_content" |
|
|
|
android:layout_marginBottom="6dp" |
|
|
@ -71,9 +71,9 @@ |
|
|
|
android:hint="@string/upload_title_hint" |
|
|
|
android:inputType="text" |
|
|
|
android:maxLength="500" /> |
|
|
|
</android.support.design.widget.TextInputLayout> |
|
|
|
</com.google.android.material.textfield.TextInputLayout> |
|
|
|
|
|
|
|
<android.support.design.widget.TextInputLayout |
|
|
|
<com.google.android.material.textfield.TextInputLayout |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="wrap_content" |
|
|
|
android:layout_marginBottom="6dp" |
|
|
@ -85,9 +85,9 @@ |
|
|
|
android:layout_height="wrap_content" |
|
|
|
android:hint="@string/upload_description_hint" |
|
|
|
android:inputType="textMultiLine" /> |
|
|
|
</android.support.design.widget.TextInputLayout> |
|
|
|
</com.google.android.material.textfield.TextInputLayout> |
|
|
|
|
|
|
|
<android.support.v7.widget.AppCompatButton |
|
|
|
<androidx.appcompat.widget.AppCompatButton |
|
|
|
android:id="@+id/upload_title_description_builder" |
|
|
|
android:layout_width="wrap_content" |
|
|
|
android:layout_height="wrap_content" |
|
|
@ -97,7 +97,7 @@ |
|
|
|
android:textAlignment="center" |
|
|
|
android:textColor="@color/accent" /> |
|
|
|
|
|
|
|
<android.support.v7.widget.AppCompatTextView |
|
|
|
<androidx.appcompat.widget.AppCompatTextView |
|
|
|
android:id="@+id/upload_filename" |
|
|
|
android:layout_width="match_parent" |
|
|
|
android:layout_height="wrap_content" |
|
|
@ -118,7 +118,7 @@ |
|
|
|
android:layout_height="0dp" |
|
|
|
android:layout_weight="1" /> |
|
|
|
|
|
|
|
<android.support.v7.widget.AppCompatButton |
|
|
|
<androidx.appcompat.widget.AppCompatButton |
|
|
|
android:id="@+id/upload_select_file_button" |
|
|
|
android:layout_width="wrap_content" |
|
|
|
android:layout_height="wrap_content" |
|
|
@ -134,7 +134,7 @@ |
|
|
|
android:layout_height="0dp" |
|
|
|
android:layout_weight="1" /> |
|
|
|
|
|
|
|
<android.support.v7.widget.AppCompatButton |
|
|
|
<androidx.appcompat.widget.AppCompatButton |
|
|
|
android:id="@+id/upload_take_photo_button" |
|
|
|
android:layout_width="wrap_content" |
|
|
|
android:layout_height="wrap_content" |
|
|
@ -146,7 +146,7 @@ |
|
|
|
android:textColor="@color/primary_text" /> |
|
|
|
</LinearLayout> |
|
|
|
</LinearLayout> |
|
|
|
</android.support.v4.widget.NestedScrollView> |
|
|
|
</androidx.core.widget.NestedScrollView> |
|
|
|
|
|
|
|
<me.zhanghai.android.materialprogressbar.MaterialProgressBar |
|
|
|
android:id="@+id/progressBar" |
|
|
@ -160,7 +160,7 @@ |
|
|
|
app:mpb_indeterminateTint="@color/accent" |
|
|
|
app:mpb_progressStyle="horizontal" /> |
|
|
|
|
|
|
|
<android.support.design.widget.FloatingActionButton |
|
|
|
<com.google.android.material.floatingactionbutton.FloatingActionButton |
|
|
|
android:id="@+id/upload_fab" |
|
|
|
android:layout_width="wrap_content" |
|
|
|
android:layout_height="wrap_content" |
|
|
@ -170,4 +170,4 @@ |
|
|
|
app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareFABBehavior" |
|
|
|
app:srcCompat="@drawable/ic_file_upload_white_24dp" /> |
|
|
|
|
|
|
|
</android.support.design.widget.CoordinatorLayout> |
|
|
|
</androidx.coordinatorlayout.widget.CoordinatorLayout> |