From 97c00491f34356d4ee66472a7eb6fe517c29d6db Mon Sep 17 00:00:00 2001 From: cjj <929178101@qq.com> Date: Wed, 20 Jan 2016 10:17:56 -0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 + app/src/main/AndroidManifest.xml | 6 +- .../com/example/blockcanary/DemoActivity.java | 24 ++++- .../example/blockcanary/SplashActivity.java | 17 +++ app/src/main/res/drawable/btn_nor.xml | 12 +++ app/src/main/res/drawable/btn_pre.xml | 12 +++ app/src/main/res/drawable/btn_select.xml | 8 ++ app/src/main/res/drawable/ic_done.png | Bin 0 -> 516 bytes app/src/main/res/layout/activity_demo.xml | 39 ------- app/src/main/res/layout/activity_main.xml | 99 ++++++++++++++++++ app/src/main/res/values-v21/styles.xml | 10 ++ app/src/main/res/values/colors.xml | 7 ++ app/src/main/res/values/strings.xml | 7 +- app/src/main/res/values/styles.xml | 17 ++- 14 files changed, 212 insertions(+), 48 deletions(-) create mode 100644 app/src/main/java/com/example/blockcanary/SplashActivity.java create mode 100644 app/src/main/res/drawable/btn_nor.xml create mode 100644 app/src/main/res/drawable/btn_pre.xml create mode 100644 app/src/main/res/drawable/btn_select.xml create mode 100644 app/src/main/res/drawable/ic_done.png delete mode 100644 app/src/main/res/layout/activity_demo.xml create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/values-v21/styles.xml create mode 100644 app/src/main/res/values/colors.xml diff --git a/app/build.gradle b/app/build.gradle index 1c6b93e..84a76d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,4 +22,6 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') compile project(':library') + compile 'com.android.support:appcompat-v7:23.1.1' + compile 'com.android.support:design:23.1.1' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fb8c794..9fcd757 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,9 +7,9 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:theme="@style/AppTheme"> + android:theme="@style/CjjBaseTheme"> @@ -17,6 +17,8 @@ + + diff --git a/app/src/main/java/com/example/blockcanary/DemoActivity.java b/app/src/main/java/com/example/blockcanary/DemoActivity.java index 2045e57..89b2650 100644 --- a/app/src/main/java/com/example/blockcanary/DemoActivity.java +++ b/app/src/main/java/com/example/blockcanary/DemoActivity.java @@ -2,6 +2,9 @@ import android.app.Activity; import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.v7.app.AlertDialog; +import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -15,7 +18,10 @@ public class DemoActivity extends Activity implements View.OnClickListener { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_demo); + setContentView(R.layout.activity_main); + + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar.setTitle("BlockCanary"); Button button1 = (Button) findViewById(R.id.button1); Button button2 = (Button) findViewById(R.id.button2); @@ -24,6 +30,22 @@ protected void onCreate(Bundle savedInstanceState) { button1.setOnClickListener(this); button2.setOnClickListener(this); button3.setOnClickListener(this); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + showTipDlg(); + } + }); + } + + private void showTipDlg() { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle("Tip"); + builder.setMessage(getResources().getString(R.string.hello_world)); + builder.setNegativeButton("cancel",null); + builder.show(); } @Override diff --git a/app/src/main/java/com/example/blockcanary/SplashActivity.java b/app/src/main/java/com/example/blockcanary/SplashActivity.java new file mode 100644 index 0000000..d361ded --- /dev/null +++ b/app/src/main/java/com/example/blockcanary/SplashActivity.java @@ -0,0 +1,17 @@ +package com.example.blockcanary; + +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; + +public class SplashActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + SplashActivity.this.setTheme(R.style.CjjBaseTheme_WhiteActivity); + super.onCreate(savedInstanceState); + startActivity(new Intent(this, DemoActivity.class)); + SplashActivity.this.finish(); + overridePendingTransition(0, 0); + } +} diff --git a/app/src/main/res/drawable/btn_nor.xml b/app/src/main/res/drawable/btn_nor.xml new file mode 100644 index 0000000..e811509 --- /dev/null +++ b/app/src/main/res/drawable/btn_nor.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_pre.xml b/app/src/main/res/drawable/btn_pre.xml new file mode 100644 index 0000000..834b3ba --- /dev/null +++ b/app/src/main/res/drawable/btn_pre.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_select.xml b/app/src/main/res/drawable/btn_select.xml new file mode 100644 index 0000000..a8a916a --- /dev/null +++ b/app/src/main/res/drawable/btn_select.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_done.png b/app/src/main/res/drawable/ic_done.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5bc7e090422d8100df27bbe8ad463cfbf757e5 GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U_9;V;uunK>+P*xUuQ!e*N1!z zsmyALGHf5iWE<|+N+|4E-qgavbje~{@_euIhI#&>x2MZQWwSpsR|1;B%)kINiid$g zf`P#RZ1@2Nh6YB6gu{xvIlI{p=>N;M-p|6Y|A#MgQ1=5HvjVVLun`9rPy=^qRh$Jq~9+A*B_$XL)9FMGhYF1116<7%ds&UitEkUv=r z4>Tp;#s`ExZf4REj+cIrcRTa8=*PE=-+tuF=f670 znYi;u6hr)DbM+S0$Jq>jMD9x^-u$tcVgJ$XP7zlBI1aqEe^kFuPF+z)zW$4_f^2@A zw4!TG?|TOR7TbTtZ9k&+H&qF)>sO;QoJ~ zh>rL58u~}R?-x}B64R8fK6c+Bt}^wp`_37vp^x2nNvexJcHccq#J - - - -