Skip to content

Commit d22c0b6

Browse files
committed
change package
1 parent a23bd88 commit d22c0b6

File tree

10 files changed

+130
-145
lines changed

10 files changed

+130
-145
lines changed

.idea/gradle.xml

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

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121

2222
dependencies {
2323
implementation fileTree(dir: 'libs', include: ['*.jar'])
24-
implementation 'androidx.appcompat:appcompat:1.0.2'
24+
implementation 'androidx.appcompat:appcompat:1.1.0'
2525
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
2626

2727
implementation project(':drawabletextview')
-4.79 KB
Binary file not shown.

app/build/outputs/logs/manifest-merger-debug-report.txt

Lines changed: 116 additions & 134 deletions
Large diffs are not rendered by default.

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.flod.view.app">
3+
package="com.flod.drawabletextview.app">
44

55
<application
66
android:allowBackup="true"
@@ -9,7 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme">
12-
<activity android:name="com.flod.view.app.MainActivity">
12+
<activity android:name="com.flod.drawabletextview.app.MainActivity">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />
1515

app/src/main/java/com/flod/view/app/MainActivity.java renamed to app/src/main/java/com/flod/drawabletextview/app/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flod.view.app;
1+
package com.flod.drawabletextview.app;
22

33
import android.os.Bundle;
44
import android.widget.CompoundButton;
@@ -7,7 +7,7 @@
77

88
import androidx.appcompat.app.AppCompatActivity;
99

10-
import com.flod.view.DrawableTextView;
10+
import com.flod.drawabletextview.DrawableTextView;
1111

1212
public class MainActivity extends AppCompatActivity {
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:text="TextView"
2121
android:textSize="20sp" />
2222

23-
<com.flod.view.DrawableTextView
23+
<com.flod.drawabletextview.DrawableTextView
2424
android:id="@+id/dtv"
2525
android:layout_width="300dp"
2626
android:layout_height="150dp"

drawabletextview/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
defaultConfig {
99
minSdkVersion 21
1010
targetSdkVersion 29
11-
versionCode 100
12-
versionName "1.0.0"
11+
versionCode 101
12+
versionName "1.0.1"
1313

1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
consumerProguardFiles 'consumer-rules.pro'
@@ -27,5 +27,5 @@ android {
2727
dependencies {
2828
implementation fileTree(dir: 'libs', include: ['*.jar'])
2929

30-
compileOnly 'androidx.appcompat:appcompat:1.0.2'
30+
compileOnly 'androidx.appcompat:appcompat:1.1.0'
3131
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.flod.view" />
2+
package="com.flod.drawabletextview" />

drawabletextview/src/main/java/com/flod/view/DrawableTextView.java renamed to drawabletextview/src/main/java/com/flod/drawabletextview/DrawableTextView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flod.view;
1+
package com.flod.drawabletextview;
22

33
import android.content.Context;
44
import android.content.res.TypedArray;

0 commit comments

Comments
 (0)