Skip to content

Commit eed662e

Browse files
Some changes
1 parent 51473fc commit eed662e

File tree

20 files changed

+166
-123
lines changed

20 files changed

+166
-123
lines changed

.idea/codeStyles/Project.xml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import android.widget.TextView
55
import android.widget.Toast
66
import androidx.appcompat.app.AppCompatActivity
77
import androidx.core.content.ContextCompat
8-
import com.ecandrea.library.tooltipopwordtv.listeners.SelectableWordListeners
9-
import com.ecandrea.library.tooltipopwordtv.tooltipopupWindows.ArrowCustomised
10-
import com.ecandrea.library.tooltipopwordtv.tooltipopupWindows.ToolPopupWindows
11-
import com.ecandrea.library.tooltipopwordtv.wordTextView.SelectableWordTextView
8+
import com.boyzdroizy.library.tooltipopwordtv.listeners.SelectableWordListeners
9+
import com.boyzdroizy.library.tooltipopwordtv.tooltipopupWindows.ArrowCustomised
10+
import com.boyzdroizy.library.tooltipopwordtv.tooltipopupWindows.ToolPopupWindows
11+
import com.boyzdroizy.library.tooltipopwordtv.wordTextView.SelectableWordTextView
1212
import kotlinx.android.synthetic.main.activity_main.*
1313
import kotlinx.android.synthetic.main.custom_layout.view.*
1414

@@ -91,7 +91,7 @@ class MainActivity : AppCompatActivity() {
9191
const val text1 = "No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to " +
9292
"pursue pleasure rationally encounter consequences that are extremely painful."
9393

94-
const val text2 = "One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a horrible " +
94+
const val text2 = "One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a horrible" +
9595
"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 " +
9696
"by arches into stiff sections."
9797
}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
android:layout_height="match_parent"
77
android:fillViewport="true">
88

9-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
10-
xmlns:app="http://schemas.android.com/apk/res-auto"
11-
xmlns:tools="http://schemas.android.com/tools"
9+
<androidx.constraintlayout.widget.ConstraintLayout
1210
android:layout_width="match_parent"
13-
android:layout_height="match_parent"
11+
android:layout_height="wrap_content"
1412
android:background="@color/background_color"
1513
tools:context=".MainActivity">
1614

@@ -41,7 +39,7 @@
4139
android:textColor="@color/colorAccent"
4240
app:layout_constraintTop_toBottomOf="@id/icon" />
4341

44-
<com.ecandrea.library.tooltipopwordtv.wordTextView.SelectableWordTextView
42+
<com.boyzdroizy.library.tooltipopwordtv.wordTextView.SelectableWordTextView
4543
android:id="@+id/word"
4644
android:layout_width="match_parent"
4745
android:layout_height="wrap_content"
@@ -64,7 +62,7 @@
6462
android:textColor="@color/colorAccent"
6563
app:layout_constraintBottom_toTopOf="@id/wordTwo" />
6664

67-
<com.ecandrea.library.tooltipopwordtv.wordTextView.SelectableWordTextView
65+
<com.boyzdroizy.library.tooltipopwordtv.wordTextView.SelectableWordTextView
6866
android:id="@+id/wordTwo"
6967
android:layout_width="match_parent"
7068
android:layout_height="wrap_content"

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
android:layout_width="wrap_content"
1717
android:layout_height="wrap_content"
1818
android:layout_gravity="center"
19-
android:textStyle="bold"
2019
android:textColor="@color/colorPrimaryDark"
20+
android:textStyle="bold"
2121
app:layout_constraintEnd_toEndOf="parent"
2222
app:layout_constraintStart_toStartOf="parent"
2323
app:layout_constraintTop_toTopOf="parent"
@@ -27,8 +27,8 @@
2727
android:id="@+id/newDescription"
2828
android:layout_width="match_parent"
2929
android:layout_height="wrap_content"
30-
android:gravity="center"
3130
android:layout_marginTop="@dimen/space_10dp"
31+
android:gravity="center"
3232
android:textColor="@color/colorPrimaryDark"
3333
android:textSize="12sp"
3434
app:layout_constraintBottom_toTopOf="@id/testButton"
@@ -39,14 +39,15 @@
3939

4040
<Button
4141
android:id="@+id/testButton"
42-
android:layout_width="80dp"
43-
android:layout_height="30dp"
42+
android:layout_width="120dp"
43+
android:layout_height="35dp"
4444
android:layout_marginTop="15dp"
4545
android:layout_marginBottom="10dp"
4646
android:background="@drawable/border_dialog"
4747
android:backgroundTint="@color/btn_background"
48+
android:gravity="center"
4849
android:text="Remove"
49-
android:textColor="@color/colorPrimaryDark"
50+
android:textColor="@color/white"
5051
android:textSize="12sp"
5152
app:layout_constraintBottom_toBottomOf="parent"
5253
app:layout_constraintEnd_toEndOf="parent"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ecandrea.library.tooltipopwordtv
1+
package com.boyzdroizy.library.tooltipopwordtv
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4

tooltipopupwordtv/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.ecandrea.library.tooltipopwordtv" >
2+
package="com.boyzdroizy.library.tooltipopwordtv" >
33

44
<application android:allowBackup="true" android:label="@string/app_name"
55
android:supportsRtl="true">
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
package com.ecandrea.library.tooltipopwordtv.annotations
1+
package com.boyzdroizy.library.tooltipopwordtv.annotations
22

33
import androidx.annotation.Dimension
44

55

66
@MustBeDocumented
77
@kotlin.annotation.Retention(AnnotationRetention.BINARY)
8-
@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER,
8+
@Target(
9+
AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER,
910
AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.FIELD,
10-
AnnotationTarget.LOCAL_VARIABLE)
11+
AnnotationTarget.LOCAL_VARIABLE
12+
)
1113
@Dimension(unit = Dimension.SP)
1214
internal annotation class Sp
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ecandrea.library.tooltipopwordtv.listeners
1+
package com.boyzdroizy.library.tooltipopwordtv.listeners
22

33
import android.widget.TextView
44

tooltipopupwordtv/src/main/java/com/ecandrea/library/tooltipopwordtv/listeners/ToolTipListeners.kt renamed to tooltipopupwordtv/src/main/java/com/boyzdroizy/library/tooltipopwordtv/listeners/ToolTipListeners.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ecandrea.library.tooltipopwordtv.listeners
1+
package com.boyzdroizy.library.tooltipopwordtv.listeners
22

33
interface ToolTipListeners {
44
fun onCloseToolTip()

tooltipopupwordtv/src/main/java/com/ecandrea/library/tooltipopwordtv/model/WordInfo.kt renamed to tooltipopupwordtv/src/main/java/com/boyzdroizy/library/tooltipopwordtv/model/WordInfo.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.ecandrea.library.tooltipopwordtv.model
1+
package com.boyzdroizy.library.tooltipopwordtv.model
22

3-
import com.ecandrea.library.tooltipopwordtv.utils.TooltipPopupConstants
3+
import com.boyzdroizy.library.tooltipopwordtv.utils.TooltipPopupConstants
44

55
class WordInfo(
66
var start: Int = TooltipPopupConstants.NO_INT_VALUE,

0 commit comments

Comments
 (0)