use our custom views where appropriate

This commit is contained in:
tibbi 2016-12-25 15:17:15 +01:00
parent 5498e30788
commit 81ee5f46f5
8 changed files with 42 additions and 33 deletions

View File

@ -24,8 +24,9 @@ class PickAlbumDialog(val activity: SimpleActivity, val callback: (path: String)
AlertDialog.Builder(activity) AlertDialog.Builder(activity)
.setView(view) .setView(view)
.setNeutralButton(R.string.other_folder, { dialogInterface, i -> showOtherFolder() })
.setPositiveButton(R.string.ok, null) .setPositiveButton(R.string.ok, null)
.setNegativeButton(R.string.cancel, null)
.setNeutralButton(R.string.other_folder, { dialogInterface, i -> showOtherFolder() })
.create().apply { .create().apply {
activity.setupDialogStuff(view, this, R.string.select_destination) activity.setupDialogStuff(view, this, R.string.select_destination)

View File

@ -19,7 +19,7 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_customize_colors_label" android:id="@+id/settings_customize_colors_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -100,7 +100,7 @@
android:paddingRight="@dimen/settings_padding" android:paddingRight="@dimen/settings_padding"
android:paddingTop="@dimen/activity_margin"> android:paddingTop="@dimen/activity_margin">
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_show_media_label" android:id="@+id/settings_show_media_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -9,14 +9,14 @@
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"> android:paddingTop="@dimen/activity_margin">
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/source_label" android:id="@+id/source_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/source" android:text="@string/source"
android:textSize="@dimen/details_text_size"/> android:textSize="@dimen/details_text_size"/>
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/source" android:id="@+id/source"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -25,14 +25,14 @@
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"/> android:paddingTop="@dimen/small_padding"/>
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/destination_label" android:id="@+id/destination_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/destination" android:text="@string/destination"
android:textSize="@dimen/details_text_size"/> android:textSize="@dimen/details_text_size"/>
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/destination" android:id="@+id/destination"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -7,14 +7,14 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/file_path_label" android:id="@+id/file_path_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/path" android:text="@string/path"
android:textSize="@dimen/details_text_size"/> android:textSize="@dimen/details_text_size"/>
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/file_path" android:id="@+id/file_path"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -23,24 +23,26 @@
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"/> android:paddingTop="@dimen/small_padding"/>
<EditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/file_name" android:id="@+id/file_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:singleLine="true"/> android:singleLine="true"
android:textCursorDrawable="@null"/>
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/file_extension_label" android:id="@+id/file_extension_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/extension"/> android:text="@string/extension"/>
<EditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/file_extension" android:id="@+id/file_extension"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:singleLine="true"/> android:singleLine="true"
android:textCursorDrawable="@null"/>
</LinearLayout> </LinearLayout>

View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout
android:id="@+id/video_holder" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:id="@+id/video_holder"
android:layout_height="match_parent"> android:layout_width="match_parent"
android:layout_height="match_parent">
<SurfaceView <SurfaceView
android:id="@+id/video_surface" android:id="@+id/video_surface"

View File

@ -7,16 +7,17 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/directory_path" android:id="@+id/directory_path"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<EditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/directory_name" android:id="@+id/directory_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:singleLine="true"/> android:singleLine="true"
android:textCursorDrawable="@null"/>
</LinearLayout> </LinearLayout>

View File

@ -7,29 +7,31 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/file_path" android:id="@+id/file_path"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<EditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/file_name" android:id="@+id/file_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:singleLine="true"/> android:singleLine="true"
android:textCursorDrawable="@null"/>
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/file_extension_label" android:id="@+id/file_extension_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/extension"/> android:text="@string/extension"/>
<EditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/file_extension" android:id="@+id/file_extension"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:singleLine="true"/> android:singleLine="true"
android:textCursorDrawable="@null"/>
</LinearLayout> </LinearLayout>

View File

@ -7,13 +7,13 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/activity_margin"> android:padding="@dimen/activity_margin">
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/image_width_label" android:id="@+id/image_width_label"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/width"/> android:text="@string/width"/>
<EditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/image_width" android:id="@+id/image_width"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -21,9 +21,10 @@
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:inputType="number" android:inputType="number"
android:maxLength="6" android:maxLength="6"
android:maxLines="1"/> android:maxLines="1"
android:textCursorDrawable="@null"/>
<TextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/image_height_label" android:id="@+id/image_height_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -32,7 +33,7 @@
android:layout_toRightOf="@+id/image_width_label" android:layout_toRightOf="@+id/image_width_label"
android:text="@string/height"/> android:text="@string/height"/>
<EditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/image_height" android:id="@+id/image_height"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -41,7 +42,8 @@
android:layout_below="@+id/image_width_label" android:layout_below="@+id/image_width_label"
android:inputType="number" android:inputType="number"
android:maxLength="6" android:maxLength="6"
android:maxLines="1"/> android:maxLines="1"
android:textCursorDrawable="@null"/>
<com.simplemobiletools.commons.views.MyAppCompatCheckbox <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/keep_aspect_ratio" android:id="@+id/keep_aspect_ratio"