Skip to content

Commit

Permalink
change module names
Browse files Browse the repository at this point in the history
  • Loading branch information
zijing07 committed Apr 19, 2018
1 parent 42eb464 commit 330b673
Show file tree
Hide file tree
Showing 19 changed files with 22 additions and 22 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
implementation project(':extendedtextview')
implementation project(':extextview')
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.mozidev.me.extextview;
package lib.mozidev.me.demo;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="lib.mozidev.me.extextview">
package="lib.mozidev.me.demo">

<application
android:allowBackup="true"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.mozidev.me.extextview;
package lib.mozidev.me.demo;

import android.graphics.Color;
import android.os.Bundle;
Expand All @@ -12,8 +12,8 @@
import java.util.Arrays;
import java.util.List;

import lib.mozidev.me.extendedtextview.ExtendedTextView;
import lib.mozidev.me.extendedtextview.StrikeThroughPainting;
import lib.mozidev.me.extextview.ExTextView;
import lib.mozidev.me.extextview.StrikeThroughPainting;

public class MainActivity extends AppCompatActivity {

Expand All @@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

final ExtendedTextView tv = findViewById(R.id.extendedTextView);
final ExTextView tv = findViewById(R.id.extendedTextView);
strikeThroughPainting = new StrikeThroughPainting(tv);

findViewById(R.id.button).setOnClickListener(new View.OnClickListener() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:id="@+id/container"
tools:context=".MainActivity">

<lib.mozidev.me.extendedtextview.ExtendedTextView
<lib.mozidev.me.extextview.ExTextView
android:id="@+id/extendedTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.mozidev.me.extendedtextview;
package lib.mozidev.me.demo;

import org.junit.Test;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.mozidev.me.extendedtextview;
package lib.mozidev.me.extextview;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="lib.mozidev.me.extendedtextview" />
package="lib.mozidev.me.extextview" />
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.mozidev.me.extendedtextview;
package lib.mozidev.me.extextview;

import android.content.Context;
import android.graphics.Canvas;
Expand All @@ -12,20 +12,20 @@
/**
* created by zijing on 17/04/2018
*/
public class ExtendedTextView extends AppCompatTextView {
public class ExTextView extends AppCompatTextView {

@Nullable
private List<IPainting> paintings = null;

public ExtendedTextView(Context context) {
public ExTextView(Context context) {
this(context, null);
}

public ExtendedTextView(Context context, AttributeSet attrs) {
public ExTextView(Context context, AttributeSet attrs) {
this(context, attrs, android.R.attr.textViewStyle);
}

public ExtendedTextView(Context context, AttributeSet attrs, int defStyleAttr) {
public ExTextView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.mozidev.me.extendedtextview;
package lib.mozidev.me.extextview;

import android.graphics.Canvas;
import android.support.annotation.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.mozidev.me.extendedtextview;
package lib.mozidev.me.extextview;

import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
Expand Down Expand Up @@ -46,7 +46,7 @@ public class StrikeThroughPainting implements IPainting {
private static final boolean STRIKE_THROUGH_CUT_TEXT_EDGE = true;

@NonNull
private ExtendedTextView targetView;
private ExTextView targetView;
@Nullable
private StrikeThroughPaintingCallback strikeThroughPaintingCallback = null;
private Paint paint = new Paint();
Expand All @@ -62,7 +62,7 @@ public class StrikeThroughPainting implements IPainting {
private int strikeThroughMode = STRIKE_THROUGH_MODE;
private boolean strikeThroughCutTextEdge = STRIKE_THROUGH_CUT_TEXT_EDGE;

public StrikeThroughPainting(@NonNull ExtendedTextView targetView) {
public StrikeThroughPainting(@NonNull ExTextView targetView) {
this.targetView =targetView;
this.targetView.addPainting(this);
paint.setColor(strikeThroughColor);
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':extendedtextview'
include ':app', ':extextview'

0 comments on commit 330b673

Please sign in to comment.