Merge pull request #17 from EusebiuCandrea/eusebiu_dev

Eusebiu dev

Author: EusebiuCandrea

.idea/codeStyles/Project.xml

@@ -6,10 +6,10 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "com.example.tooltipopbyword"
-        minSdkVersion 23
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -26,12 +26,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.material:material:1.3.0'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     implementation project (path: ':tooltipopupwordtv')
 }

.idea/codeStyles/codeStyleConfig.xml

@@ -5,10 +5,10 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import com.ecandrea.library.tooltipopwordtv.listeners.SelectableWordListeners
-import com.ecandrea.library.tooltipopwordtv.tooltipopupWindows.ArrowCustomizer
-import com.ecandrea.library.tooltipopwordtv.tooltipopupWindows.ToolPopupWindows
-import com.ecandrea.library.tooltipopwordtv.wordTextView.SelectableWordTextView
+import com.boyzdroizy.library.tooltipopwordtv.listeners.SelectableWordListeners
+import com.boyzdroizy.library.tooltipopwordtv.tooltipopupWindows.ArrowCustomised
+import com.boyzdroizy.library.tooltipopwordtv.tooltipopupWindows.ToolPopupWindows
+import com.boyzdroizy.library.tooltipopwordtv.wordTextView.SelectableWordTextView
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.custom_layout.view.*
 
@@ -32,7 +32,7 @@ class MainActivity : AppCompatActivity() {
                             .setTitleTextColor(ContextCompat.getColor(this@MainActivity, R.color.colorAccent))
                             .setTitleTextSize(20f)
                             .setIsOutsideTouchable(false)
-                            .setArrowCustomizer(ArrowCustomizer.Builder(this@MainActivity)
+                            .setArrowCustomizer(ArrowCustomised.Builder(this@MainActivity)
                                     .setArrowSize(14)
                                     .build())
                             .build()
@@ -54,7 +54,7 @@ class MainActivity : AppCompatActivity() {
                             .setIsOutsideTouchable(true)
                             .setWidthPercentsFromScreen(0.7)
                             .setAutoDismissDuration(2000)
-                            .setArrowCustomizer(ArrowCustomizer.Builder(this@MainActivity)
+                            .setArrowCustomizer(ArrowCustomised.Builder(this@MainActivity)
                                     .setArrowColor(ContextCompat.getColor(this@MainActivity, R.color.arrow))
                                     .setArrowSize(25)
                                     .build())
@@ -91,7 +91,7 @@ class MainActivity : AppCompatActivity() {
         const val text1 = "No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to " +
                 "pursue pleasure rationally encounter consequences that are extremely painful."
 
-        const val text2 = "One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a horrible " +
+        const val text2 = "One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a horrible" +
                 "vermin. He lay on his armour-like back, and if he lifted his head a little he could see his brown belly, slightly domed and divided " +
                 "by arches into stiff sections."
     }

.idea/gradle.xml

@@ -6,11 +6,9 @@
     android:layout_height="match_parent"
     android:fillViewport="true">
 
-    <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"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@color/background_color"
         tools:context=".MainActivity">
 
@@ -41,7 +39,7 @@
             android:textColor="@color/colorAccent"
             app:layout_constraintTop_toBottomOf="@id/icon" />
 
-        <com.ecandrea.library.tooltipopwordtv.wordTextView.SelectableWordTextView
+        <com.boyzdroizy.library.tooltipopwordtv.wordTextView.SelectableWordTextView
             android:id="@+id/word"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -64,7 +62,7 @@
             android:textColor="@color/colorAccent"
             app:layout_constraintBottom_toTopOf="@id/wordTwo" />
 
-        <com.ecandrea.library.tooltipopwordtv.wordTextView.SelectableWordTextView
+        <com.boyzdroizy.library.tooltipopwordtv.wordTextView.SelectableWordTextView
             android:id="@+id/wordTwo"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

.idea/misc.xml

@@ -16,8 +16,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:textStyle="bold"
         android:textColor="@color/colorPrimaryDark"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -27,8 +27,8 @@
         android:id="@+id/newDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:layout_marginTop="@dimen/space_10dp"
+        android:gravity="center"
         android:textColor="@color/colorPrimaryDark"
         android:textSize="12sp"
         app:layout_constraintBottom_toTopOf="@id/testButton"
@@ -39,14 +39,15 @@
 
     <Button
         android:id="@+id/testButton"
-        android:layout_width="80dp"
-        android:layout_height="30dp"
+        android:layout_width="120dp"
+        android:layout_height="35dp"
         android:layout_marginTop="15dp"
         android:layout_marginBottom="10dp"
         android:background="@drawable/border_dialog"
         android:backgroundTint="@color/btn_background"
+        android:gravity="center"
         android:text="Remove"
-        android:textColor="@color/colorPrimaryDark"
+        android:textColor="@color/white"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/build.gradle

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

app/src/main/java/com/example/tooltipopbyword/MainActivity.kt

@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files