diff options
| -rw-r--r-- | app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt | 3 | ||||
| -rw-r--r-- | app/src/main/res/drawable/ic_mode_edit_white_24dp.xml (renamed from app/src/main/res/drawable/ic_mode_edit_black_24dp.xml) | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_media_preview.xml | 27 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_photo_editor.xml | 2 |
4 files changed, 4 insertions, 29 deletions
diff --git a/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt b/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt index dd537a7..38031ad 100644 --- a/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt +++ b/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt @@ -2,6 +2,7 @@ package me.texx.Texx import android.net.Uri import android.os.Bundle +import android.support.v4.content.ContextCompat import android.support.v7.app.AppCompatActivity import android.view.View import android.view.Window @@ -55,7 +56,7 @@ class PhotoEditorActivity : AppCompatActivity() { if (currentlyDrawing) drawColorSeekbar.visibility = View.VISIBLE else { drawColorSeekbar.visibility = View.GONE - photoDrawButton.setBackgroundColor(View.INVISIBLE) + photoDrawButton.background = ContextCompat.getDrawable(this, R.drawable.ic_mode_edit_white_24dp) } } diff --git a/app/src/main/res/drawable/ic_mode_edit_black_24dp.xml b/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml index b49930d..c67fadd 100644 --- a/app/src/main/res/drawable/ic_mode_edit_black_24dp.xml +++ b/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml @@ -1,6 +1,7 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0"> <path diff --git a/app/src/main/res/layout/activity_media_preview.xml b/app/src/main/res/layout/activity_media_preview.xml deleted file mode 100644 index 86c6406..0000000 --- a/app/src/main/res/layout/activity_media_preview.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.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" - tools:context=".MediaPreviewActivity"> - - <ImageView - android:id="@+id/imagePreview" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:contentDescription="Kwel image" - app:srcCompat="@drawable/ic_camera_black_24dp" /> - - <android.support.design.widget.FloatingActionButton - android:id="@+id/floatingActionButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="24dp" - android:layout_marginEnd="24dp" - android:clickable="true" - app:fabSize="normal" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:srcCompat="@drawable/ic_send_black_24dp" /> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_photo_editor.xml b/app/src/main/res/layout/activity_photo_editor.xml index dd0abba..df62664 100644 --- a/app/src/main/res/layout/activity_photo_editor.xml +++ b/app/src/main/res/layout/activity_photo_editor.xml @@ -37,7 +37,7 @@ android:layout_height="50dp" android:layout_marginEnd="24dp" android:layout_marginTop="24dp" - android:background="@drawable/ic_mode_edit_black_24dp" + android:background="@drawable/ic_mode_edit_white_24dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> |