迁移项目

This commit is contained in:
2025-12-10 23:03:26 +08:00
parent 28fe161276
commit 51890e9432
67 changed files with 2461 additions and 985 deletions

View File

@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/colorWhite">
android:background="@color/colorWhite"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="66dp"
@@ -24,33 +22,33 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="版本信息"
android:gravity="center"
android:textColor="#ffffff"
android:textSize="18sp"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="12dp"/>
android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"
android:gravity="center"
android:text="版本信息"
android:textColor="#ffffff"
android:textSize="18sp" />
<ImageButton
android:id="@+id/toolbar_back"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/new_nav_back"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="0dp"/>
android:layout_marginBottom="0dp"
android:src="@drawable/new_nav_back" />
</RelativeLayout>
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -69,17 +67,17 @@
android:id="@+id/desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/about_info"
android:textSize="15sp"
android:lineSpacingExtra="5dp"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/version"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" />
android:layout_marginRight="16dp"
android:lineSpacingExtra="5dp"
android:text="@string/about_info"
android:textSize="15sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/version" />
<TextView
android:id="@+id/darwin_tv"
@@ -102,8 +100,8 @@
android:layout_marginTop="5dp"
android:layout_marginRight="16dp"
android:text="http://www.easydarwin.org"
android:textSize="14sp"
android:textColor="@color/colorTheme2"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/darwin_tv" />
@@ -129,8 +127,8 @@
android:layout_marginTop="5dp"
android:layout_marginRight="16dp"
android:text="http://www.easydss.com"
android:textSize="14sp"
android:textColor="@color/colorTheme2"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dss_tv" />
@@ -173,18 +171,18 @@
app:layout_constraintTop_toBottomOf="@+id/nvr_content_tv" />
<TextView
android:text="Copyright @ Open.TSINGSEE.com"
android:layout_height="40dp"
android:layout_width="0dp"
android:gravity="center"
android:id="@+id/textView3"
android:background="@color/colorTheme2"
android:textColor="#FFFFFF"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginTop="30dp"
app:layout_constraintTop_toBottomOf="@+id/imageView"
android:background="@color/colorTheme2"
android:gravity="center"
android:text="Copyright @ Open.TSINGSEE.com"
android:textColor="#FFFFFF"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</android.support.constraint.ConstraintLayout>
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</LinearLayout>

View File

@@ -9,24 +9,24 @@
tools:context="org.easydarwin.easyplayer.PlayActivity">
<FrameLayout
android:id="@+id/render_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/render_container"
android:layout_gravity="center"
android:background="#000000">
<org.easydarwin.easyplayer.views.ProVideoView
android:id="@+id/video_view2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:keepScreenOn="true"
android:visibility="gone"
android:layout_height="match_parent" />
android:visibility="gone" />
<org.easydarwin.easyplayer.views.ProVideoView
android:id="@+id/video_view"
android:layout_width="match_parent"
android:keepScreenOn="true"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:keepScreenOn="true" />
<ImageView
android:id="@+id/surface_cover"
@@ -40,8 +40,8 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_gravity="center"
android:gravity="center"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical">
<ProgressBar
@@ -51,12 +51,12 @@
android:indeterminateDrawable="@drawable/anim" />
<TextView
android:layout_width="wrap_content"
android:text="加载中"
android:id="@+id/loading_speed"
android:textColor="@color/colorTheme"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_height="wrap_content" />
android:text="加载中"
android:textColor="@color/colorTheme" />
</LinearLayout>
@@ -77,16 +77,16 @@
android:id="@+id/player_container"
android:layout_width="match_parent"
android:layout_height="200dp"
android:background="#fff"
android:layout_gravity="center"
android:background="#fff"
android:gravity="center"
android:visibility="gone"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/new_lost"/>
android:src="@drawable/new_lost" />
</LinearLayout>

View File

@@ -6,10 +6,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/colorWhite">
android:background="@color/colorWhite"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="66dp"
@@ -22,42 +22,42 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="文件夹"
android:gravity="center"
android:textColor="#ffffff"
android:textSize="18sp"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="12dp"/>
android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"
android:gravity="center"
android:text="文件夹"
android:textColor="#ffffff"
android:textSize="18sp" />
<ImageButton
android:id="@+id/toolbar_back"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/new_nav_back"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="0dp"/>
android:layout_marginBottom="0dp"
android:src="@drawable/new_nav_back" />
</RelativeLayout>
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.view.PagerTitleStrip
<androidx.viewpager.widget.PagerTitleStrip
android:id="@+id/pager_title_strip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#f2f2f2"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:background="#f2f2f2"
android:textAlignment="center"
android:textSize="16sp" />
</android.support.v4.view.ViewPager>
</androidx.viewpager.widget.ViewPager>
</LinearLayout>
</layout>

View File

@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#ffffff"
android:orientation="vertical"
tools:context="org.easydarwin.easyplayer.activity.PlayListActivity">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="66dp"
@@ -24,27 +22,27 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="EasyPlayer Pro"
android:gravity="center"
android:textColor="#ffffff"
android:textSize="18sp"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="12dp"/>
android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"
android:gravity="center"
android:text="EasyPlayer Pro"
android:textColor="#ffffff"
android:textSize="18sp" />
<ImageButton
android:id="@+id/toolbar_about"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/new_version1"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="0dp"/>
android:layout_marginBottom="0dp"
android:src="@drawable/new_version1" />
</RelativeLayout>
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
<LinearLayout
android:id="@+id/bottom_ll"
@@ -56,64 +54,64 @@
<TextView
android:id="@+id/toolbar_add"
android:layout_height="match_parent"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_weight="1"
android:text="地址"
android:textColor="@drawable/new_color_text"
android:textSize="13sp"
android:drawableTop="@drawable/new_address_btn"
android:paddingTop="8dp"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_gravity="end" />
android:text="地址"
android:textColor="@drawable/new_color_text"
android:textSize="13sp" />
<TextView
android:id="@+id/toolbar_file"
android:layout_height="match_parent"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_weight="1"
android:drawableTop="@drawable/new_file_btn"
android:onClick="fileList"
android:paddingTop="8dp"
android:text="文件夹"
android:textColor="@drawable/new_color_text"
android:textSize="13sp"
android:drawableTop="@drawable/new_file_btn"
android:paddingTop="8dp"
android:onClick="fileList"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_gravity="end" />
android:textSize="13sp" />
<TextView
android:id="@+id/toolbar_setting"
android:layout_height="match_parent"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_weight="1"
android:text="设置"
android:textColor="@drawable/new_color_text"
android:textSize="13sp"
android:drawableTop="@drawable/new_setting_btn"
android:paddingTop="8dp"
style="@style/Base.Widget.AppCompat.ActionButton"
android:layout_gravity="end" />
android:text="设置"
android:textColor="@drawable/new_color_text"
android:textSize="13sp" />
</LinearLayout>
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/pull_to_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
android:layout_above="@id/bottom_ll">
android:layout_above="@id/bottom_ll"
android:layout_below="@id/toolbar">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</RelativeLayout>

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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="match_parent">
@@ -13,19 +12,19 @@
app:autoFocusButtonVisible="false"
app:flashButtonColor="@android:color/white"
app:flashButtonVisible="true"
app:frameAspectRatioHeight="1"
app:frameAspectRatioWidth="1"
app:frameColor="@android:color/white"
app:frameCornersSize="50dp"
app:frameAspectRatioWidth="1"
app:frameAspectRatioHeight="1"
app:frameSize="0.75"
app:frameThickness="2dp"
app:maskColor="#66000000"/>
app:maskColor="#66000000" />
<ImageView
android:layout_width="56dp"
android:src="@drawable/new_nav_back"
android:padding="18dp"
android:layout_height="56dp"
android:onClick="onClose"
android:layout_height="56dp" />
android:padding="18dp"
android:src="@drawable/new_nav_back" />
</FrameLayout>

View File

@@ -9,7 +9,7 @@
android:background="@color/colorWhite"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="66dp"
@@ -42,7 +42,7 @@
</RelativeLayout>
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
<RelativeLayout
android:layout_width="match_parent"

View File

@@ -14,13 +14,13 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
android:gravity="center"
android:text="EasyPlayer Pro"
android:textColor="#FFFFFF"
android:textSize="20sp"
android:text="EasyPlayer Pro" />
android:textSize="20sp" />
<TextView
android:id="@+id/txt_copyright"
@@ -30,21 +30,19 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:gravity="center"
android:text="Copyright @ Open.TSINGSEE.com"
android:textColor="#666"
android:textSize="12sp"
android:text="Copyright @ Open.TSINGSEE.com" />
android:textSize="12sp" />
<TextView
android:id="@+id/txt_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/txt_copyright"
android:layout_marginBottom="10dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:text="EasyPlayer 1.0.0"
android:textColor="#666"
android:textSize="12sp"
android:text="EasyPlayer 1.0.0" />
android:textSize="12sp" />
</RelativeLayout>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />

View File

@@ -10,8 +10,8 @@
android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_margin="1dp"
android:background="#666"
android:adjustViewBounds="true"
android:background="#666"
android:scaleType="centerCrop" />
<ImageView
@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/new_player"/>
android:src="@drawable/new_player" />
<CheckBox
android:id="@+id/image_checkbox"

View File

@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/media_controller_ll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/media_controller_ll"
android:background="#6000"
android:orientation="vertical">
@@ -17,26 +16,26 @@
android:id="@+id/tv_speed"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:visibility="gone"
android:textColor="@color/white" />
android:layout_weight="1"
android:textColor="@color/white"
android:visibility="gone" />
<TextView
android:id="@+id/tv_fps"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_weight="1"
android:visibility="gone"
android:layout_height="wrap_content"
android:textColor="@color/white" />
android:layout_weight="1"
android:textColor="@color/white"
android:visibility="gone" />
<TextView
android:id="@+id/tv_kbps"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/white"
android:visibility="gone" />
</LinearLayout>
@@ -49,38 +48,38 @@
<ImageButton
android:id="@+id/slow"
android:layout_weight="1"
style="@android:style/MediaButton.Next"
android:src="@drawable/new_slow_btn"
android:contentDescription="@string/description" />
android:layout_weight="1"
android:contentDescription="@string/description"
android:src="@drawable/new_slow_btn" />
<ImageButton
android:id="@+id/rewind"
android:layout_weight="1"
style="@android:style/MediaButton.Rew"
android:src="@drawable/new_moveback_btn"
android:contentDescription="@string/description" />
android:layout_weight="1"
android:contentDescription="@string/description"
android:src="@drawable/new_moveback_btn" />
<ImageButton
android:id="@+id/pause"
android:layout_weight="1"
style="@android:style/MediaButton.Play"
android:src="@drawable/new_stop_white"
android:contentDescription="@string/description" />
android:layout_weight="1"
android:contentDescription="@string/description"
android:src="@drawable/new_stop_white" />
<ImageButton
android:id="@+id/fast_forward"
android:layout_weight="1"
style="@android:style/MediaButton.Ffwd"
android:src="@drawable/new_forward_btn"
android:contentDescription="@string/description" />
android:layout_weight="1"
android:contentDescription="@string/description"
android:src="@drawable/new_forward_btn" />
<ImageButton
android:id="@+id/fast"
android:layout_weight="1"
style="@android:style/MediaButton.Ffwd"
android:src="@drawable/new_fast_btn"
android:contentDescription="@string/description" />
android:layout_weight="1"
android:contentDescription="@string/description"
android:src="@drawable/new_fast_btn" />
</LinearLayout>
@@ -95,52 +94,52 @@
android:id="@+id/action_take_picture"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/new_snapshot_btn" />
<ImageButton
android:id="@+id/action_record"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/new_videotape_btn" />
<TextView
android:id="@+id/tv_record_time"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center"
android:visibility="gone"
android:textColor="#ff0000"
android:drawablePadding="5dp"
android:layout_weight="1"
android:drawableLeft="@drawable/red_dot"
android:text="00:00" />
android:drawablePadding="5dp"
android:gravity="center"
android:text="00:00"
android:textColor="#ff0000"
android:visibility="gone" />
<ImageButton
android:id="@+id/action_change_mode"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/new_stretch_btn" />
<ImageButton
android:id="@+id/fullscreen"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/new_full" />
</LinearLayout>
<LinearLayout
android:id="@+id/seek_bar_container"
android:layout_width="match_parent"
android:layout_height="30dp"
android:id="@+id/seek_bar_container"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -150,20 +149,20 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingLeft="4dip"
android:paddingRight="4dip"
android:paddingTop="4dip"
android:textSize="14sp"
android:paddingRight="4dip"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
<SeekBar
android:id="@+id/media_controller_progress"
style="@style/CustomSeekbarStyle"
android:progress="10"
android:secondaryProgress="60"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
android:progress="10"
android:secondaryProgress="60" />
<TextView
android:id="@+id/total_time"
@@ -171,9 +170,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingLeft="4dip"
android:textColor="@color/white"
android:paddingRight="4dip"
android:paddingTop="4dip"
android:paddingRight="4dip"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />

View File

@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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:background="@color/colorWhite">
@@ -11,12 +9,12 @@
android:id="@+id/new_media_scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/new_scan_btn"
android:background="@null"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginRight="8dp"
app:layout_constraintTop_toTopOf="@id/new_media_source_url"
app:layout_constraintBottom_toBottomOf="@id/new_media_source_url" />
android:background="@null"
android:src="@drawable/new_scan_btn"
app:layout_constraintBottom_toBottomOf="@id/new_media_source_url"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/new_media_source_url" />
<EditText
@@ -32,4 +30,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="240dp"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin">
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin">
<FrameLayout
android:layout_width="match_parent"
@@ -32,10 +31,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxHeight="40dp"
android:minHeight="40dp"
android:ellipsize="end"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="9"
@@ -55,5 +54,5 @@
</LinearLayout>
</FrameLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</layout>