Merge branch 'dev'

Author: rosuH

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
         applicationId = "me.rosuh.easywatermark"
         minSdk = (Apps.minSdk)
         targetSdk = (Apps.targetSdk)
-        versionCode = 20604
-        versionName = "2.6.4"
+        versionCode = 20605
+        versionName = "2.6.5"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", "$applicationId-v$versionName($versionCode)")
     }

app/src/main/res/layout/dialog_edit_text.xml

@@ -15,6 +15,7 @@
         android:minHeight="165dp"
         android:paddingTop="15dp"
         android:paddingBottom="25dp"
+        android:hint="@string/hint_tips_input_water_mark_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
@@ -23,7 +24,6 @@
             android:id="@+id/et_water_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/hint_tips_input_water_mark_text"
             android:imeActionLabel="@string/tips_ok"
             android:imeOptions="actionDone"
             android:scrollbars="vertical"