Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
HeYongRui committed Dec 3, 2018
1 parent f250901 commit 5440919
Show file tree
Hide file tree
Showing 14 changed files with 103 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .idea/modules.xml

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

4 changes: 2 additions & 2 deletions 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="com.heyongrui.catloadingview">
package="com.heyongrui.catmouseview">

<application
android:allowBackup="true"
Expand All @@ -9,7 +9,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity android:name="com.heyongrui.catmouseview.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
28 changes: 0 additions & 28 deletions app/src/main/java/com/heyongrui/catloadingview/MainActivity.java

This file was deleted.

47 changes: 47 additions & 0 deletions app/src/main/java/com/heyongrui/catmouseview/MainActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.heyongrui.catmouseview;

import android.graphics.Color;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.widget.LinearLayout;

import com.heyongrui.catmouseview.library.CatMouseDialog;
import com.heyongrui.catmouseview.library.CatMouseView;

public class MainActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
CatMouseView loadingview = findViewById(R.id.loadingview1);
LinearLayout group = findViewById(R.id.loadingview2);
findViewById(R.id.button1).setOnClickListener(view -> {
CatMouseDialog loadingDialog = new CatMouseDialog(MainActivity.this);
loadingDialog.show();
});
findViewById(R.id.button2).setOnClickListener(view -> {
boolean running = loadingview.isRunning();
if (running) {
loadingview.stopAnim();
} else {
loadingview.startAnim();
}
});
findViewById(R.id.button3).setOnClickListener(view -> {
group.removeAllViews();
CatMouseView catMouseView = creatDynamic();
group.addView(catMouseView);
catMouseView.startAnim();
});
}

private CatMouseView creatDynamic() {
CatMouseView catMouseView = new CatMouseView(this);
catMouseView.setBgFilletRadius(30);
catMouseView.setAnimDuration(3000);
catMouseView.setBgColor(Color.MAGENTA);
catMouseView.setIsShowGraduallyText(true);
return catMouseView;
}
}
46 changes: 35 additions & 11 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,62 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.heyongrui.catloadingview.MainActivity">
tools:context=".MainActivity">

<Button
android:id="@+id/button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Dialog"
app:layout_constraintBottom_toBottomOf="parent"
android:text="Dialog形式"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/button2"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="View"
app:layout_constraintLeft_toLeftOf="parent"
android:text="XML形式"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toRightOf="@+id/button1"
app:layout_constraintRight_toLeftOf="@+id/button3"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button1" />
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/button3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="代码形式"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toRightOf="@+id/button2"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.heyongrui.catloadingview.library.CatMouseView
android:id="@+id/loadingview"
<com.heyongrui.catmouseview.library.CatMouseView
android:id="@+id/loadingview1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
app:anim_duration="5000"
app:bg_color="@color/colorPrimary"
app:bg_fillet_radius="@dimen/dp_10"
app:gradually_text="L O A D I N G..."
app:is_show_gradually_text="false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button2" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button1" />

<LinearLayout
android:id="@+id/loadingview2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loadingview1" />

</android.support.constraint.ConstraintLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">CatLoadingView</string>
<string name="app_name">CatMousegView</string>
</resources>
2 changes: 1 addition & 1 deletion library/src/main/AndroidManifest.xml
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="com.heyongrui.catloadingview.library" />
package="com.heyongrui.catmouseview.library" />
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.heyongrui.catloadingview.library;
package com.heyongrui.catmouseview.library;

import android.content.Context;
import android.graphics.Bitmap;
Expand All @@ -9,6 +9,7 @@
import android.view.MotionEvent;
import android.view.View;


/**
* Created by lambert on 2018/11/29.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.heyongrui.catloadingview.library;
package com.heyongrui.catmouseview.library;

import android.app.Dialog;
import android.content.Context;
import android.support.annotation.NonNull;
import android.view.Gravity;
import android.view.Window;


/**
* Created by lambert on 2018/11/30.
Expand All @@ -24,6 +26,7 @@ public CatMouseDialog(@NonNull Context context, int themeResId) {

private void init(Context context) {
getWindow().setGravity(Gravity.CENTER);
requestWindowFeature(Window.FEATURE_NO_TITLE);
mCatMouseView = new CatMouseView(context);
setContentView(mCatMouseView);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.heyongrui.catloadingview.library;
package com.heyongrui.catmouseview.library;

import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
Expand All @@ -14,6 +14,7 @@
import android.view.View;
import android.view.animation.LinearInterpolator;


/**
* Created by lambert on 2018/10/15.
*/
Expand Down Expand Up @@ -80,7 +81,7 @@ private void init(Context context, @Nullable AttributeSet attrs) {
double touchAngle = angle > 180 ? (angle - 180) : (angle + 180);
float rotateAngle = mRotateAngle > 360 ? mRotateAngle % 360 : mRotateAngle;
double abs = Math.abs((rotateAngle - touchAngle));
if (abs <= 20) {//如果老鼠头的旋转角度和点击处角度误差不超过20°,就认为抓住了老鼠
if (abs <= 10) {//如果老鼠头的旋转角度和点击处角度误差不超过10°,就认为抓住了老鼠
stopRotateAnim();
catClawView1.setCanClick(false);
smileCat.setVisibility(View.VISIBLE);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.heyongrui.catloadingview.library;
package com.heyongrui.catmouseview.library;

import android.content.Context;
import android.content.res.ColorStateList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.heyongrui.catloadingview.library;
package com.heyongrui.catmouseview.library;

import android.content.Context;
import android.graphics.Canvas;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.heyongrui.catloadingview.library;
package com.heyongrui.catmouseview.library;

import android.animation.ValueAnimator;
import android.content.Context;
Expand Down
8 changes: 4 additions & 4 deletions library/src/main/res/layout/layout_cat_catch_mouse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.heyongrui.catloadingview.library.CatClawView
<com.heyongrui.catmouseview.library.CatClawView
android:id="@+id/pie_chart_view"
android:layout_width="0dp"
android:layout_height="0dp"
Expand Down Expand Up @@ -49,7 +49,7 @@
app:layout_constraintStart_toStartOf="@+id/cat"
app:layout_constraintTop_toTopOf="@+id/cat" />

<com.heyongrui.catloadingview.library.EyelidView
<com.heyongrui.catmouseview.library.EyelidView
android:id="@+id/eyelid_left"
android:layout_width="0dp"
android:layout_height="@dimen/dp_10"
Expand All @@ -66,7 +66,7 @@
app:layout_constraintEnd_toEndOf="@+id/cat"
app:layout_constraintTop_toTopOf="@+id/eye_left" />

<com.heyongrui.catloadingview.library.EyelidView
<com.heyongrui.catmouseview.library.EyelidView
android:id="@+id/eyelid_right"
android:layout_width="0dp"
android:layout_height="@dimen/dp_10"
Expand All @@ -87,7 +87,7 @@
app:layout_constraintTop_toTopOf="@+id/cat"
tools:visibility="visible" />

<com.heyongrui.catloadingview.library.GraduallyTextView
<com.heyongrui.catmouseview.library.GraduallyTextView
android:id="@+id/graduallyTextView"
android:layout_width="120dp"
android:layout_height="wrap_content"
Expand Down

0 comments on commit 5440919

Please sign in to comment.