From 6ab34d6a8041eefd6eef9febc421480b20a21a86 Mon Sep 17 00:00:00 2001 From: Notzuonotdied Date: Sun, 11 Feb 2018 09:45:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android-shapeLoadingView.iml | 2 +- app/app.iml | 64 +-- app/build.gradle | 10 +- app/src/main/AndroidManifest.xml | 12 +- .../java/com/mingle/DialogDemoActivity.java | 35 +- .../main/java/com/mingle/MainActivity.java | 43 +- .../java/com/mingle/ViewDemoActivity.java | 28 +- .../main/res/layout/activity_dialog_demo.xml | 14 +- .../main/res/layout/activity_view_demo.xml | 6 + app/src/main/res/menu/menu_main.xml | 6 - build.gradle | 12 +- gradle/wrapper/gradle-wrapper.properties | 4 +- shapeloading/build.gradle | 8 +- shapeloading/shapeloading.iml | 231 +--------- .../com/mingle/widget/BaseLoadingView.java | 395 ++++++++++++++++++ .../java/com/mingle/widget/LoadingView.java | 318 ++++---------- .../com/mingle/widget/ShapeLoadingDialog.java | 82 +++- .../com/mingle/widget/ShapeLoadingView.java | 146 +++---- .../com/mingle/widget/util/DimenUtil.java | 62 +++ .../src/main/res/drawable/aa_dialog_bg.xml | 6 +- shapeloading/src/main/res/drawable/shadow.xml | 5 +- .../src/main/res/layout/load_view.xml | 19 +- .../src/main/res/values/loading_attr.xml | 22 +- .../src/main/res/values/loading_color.xml | 1 + 24 files changed, 815 insertions(+), 716 deletions(-) delete mode 100644 app/src/main/res/menu/menu_main.xml create mode 100644 shapeloading/src/main/java/com/mingle/widget/BaseLoadingView.java create mode 100644 shapeloading/src/main/java/com/mingle/widget/util/DimenUtil.java diff --git a/android-shapeLoadingView.iml b/android-shapeLoadingView.iml index 27d504e..ea7dd32 100644 --- a/android-shapeLoadingView.iml +++ b/android-shapeLoadingView.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 2ffb599..52de6ad 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -22,25 +22,26 @@ - + + - + - + @@ -48,6 +49,13 @@ + + + + + + + @@ -62,13 +70,6 @@ - - - - - - - @@ -76,9 +77,18 @@ + + + + + + + + + @@ -87,32 +97,38 @@ + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2b4202a..c16f3bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.0' + compileSdkVersion 27 + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.mingle" - minSdkVersion 9 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -21,6 +21,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:appcompat-v7:27.0.2' compile project(':shapeloading') } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f798f0d..83c3197 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,15 +1,15 @@ + package="com.mingle"> + android:theme="@style/AppTheme"> + android:label="@string/app_name"> @@ -18,12 +18,10 @@ - + android:label="@string/title_activity_view_demo" /> - + android:label="@string/title_activity_dialog_demo" /> diff --git a/app/src/main/java/com/mingle/DialogDemoActivity.java b/app/src/main/java/com/mingle/DialogDemoActivity.java index 2181790..f83aa0d 100644 --- a/app/src/main/java/com/mingle/DialogDemoActivity.java +++ b/app/src/main/java/com/mingle/DialogDemoActivity.java @@ -1,14 +1,12 @@ package com.mingle; -import android.support.v7.app.ActionBarActivity; import android.os.Bundle; -import android.view.Menu; -import android.view.MenuItem; +import android.support.v7.app.AppCompatActivity; import android.view.View; import com.mingle.widget.ShapeLoadingDialog; -public class DialogDemoActivity extends ActionBarActivity { +public class DialogDemoActivity extends AppCompatActivity { private ShapeLoadingDialog shapeLoadingDialog; @@ -18,9 +16,12 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_dialog_demo); shapeLoadingDialog = new ShapeLoadingDialog.Builder(this) .loadText("加载中...") + .delayMS(2333) + .distanceDP(66) + .loadTextSizeSP(18) + .acceleration(2.3f) + .loadTextColorID(getResources().getColor(R.color.colorText)) .build(); - - findViewById(R.id.button1).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -29,26 +30,4 @@ public void onClick(View v) { } }); } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. -// getMenuInflater().inflate(R.menu.menu_dialog_demo, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/app/src/main/java/com/mingle/MainActivity.java b/app/src/main/java/com/mingle/MainActivity.java index 5e86b3f..ada231b 100644 --- a/app/src/main/java/com/mingle/MainActivity.java +++ b/app/src/main/java/com/mingle/MainActivity.java @@ -1,21 +1,12 @@ package com.mingle; import android.content.Intent; -import android.support.v7.app.ActionBarActivity; import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; +import android.support.v7.app.AppCompatActivity; import android.view.View; -import com.mingle.widget.ShapeLoadingDialog; - - -public class MainActivity extends ActionBarActivity { - - - +public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { @@ -25,42 +16,16 @@ protected void onCreate(Bundle savedInstanceState) { @Override public void onClick(View v) { - MainActivity.this.startActivity(new Intent(MainActivity.this,ViewDemoActivity.class)); + MainActivity.this.startActivity(new Intent(MainActivity.this, ViewDemoActivity.class)); } }); findViewById(R.id.button2).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - MainActivity.this.startActivity(new Intent(MainActivity.this,DialogDemoActivity.class)); + MainActivity.this.startActivity(new Intent(MainActivity.this, DialogDemoActivity.class)); } }); - } - - - - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/app/src/main/java/com/mingle/ViewDemoActivity.java b/app/src/main/java/com/mingle/ViewDemoActivity.java index 7840521..4dac270 100644 --- a/app/src/main/java/com/mingle/ViewDemoActivity.java +++ b/app/src/main/java/com/mingle/ViewDemoActivity.java @@ -1,37 +1,13 @@ package com.mingle; -import android.support.v7.app.ActionBarActivity; import android.os.Bundle; -import android.view.Menu; -import android.view.MenuItem; +import android.support.v7.app.AppCompatActivity; -public class ViewDemoActivity extends ActionBarActivity { +public class ViewDemoActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_view_demo); } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. -// getMenuInflater().inflate(R.menu.menu_view_demo, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/app/src/main/res/layout/activity_dialog_demo.xml b/app/src/main/res/layout/activity_dialog_demo.xml index cb55816..6041704 100644 --- a/app/src/main/res/layout/activity_dialog_demo.xml +++ b/app/src/main/res/layout/activity_dialog_demo.xml @@ -1,16 +1,18 @@