Merge pull request #55 from qiujuer/develop-caprice

Develop caprice to ui kit

README-ZH.md

@@ -47,7 +47,7 @@
 
 ```
 dependencies {
-  compile 'net.qiujuer.genius:ui:1.5.2'
+  compile 'net.qiujuer.genius:ui:1.6.0'
   compile 'net.qiujuer.genius:res:1.5.0'
   compile 'net.qiujuer.genius:kit:1.5.0'
   compile 'net.qiujuer.genius:blur:1.5.0'

README.md

@@ -46,7 +46,7 @@
 
 ```groovy
 dependencies {
-  compile 'net.qiujuer.genius:ui:1.5.2'
+  compile 'net.qiujuer.genius:ui:1.6.0'
   compile 'net.qiujuer.genius:res:1.5.0'
   compile 'net.qiujuer.genius:kit:1.5.0'
   compile 'net.qiujuer.genius:blur:1.5.0'

caprice/sample/build.gradle

@@ -34,5 +34,5 @@ dependencies {
     compile 'net.qiujuer.genius:blur:1.5.0'
     compile 'net.qiujuer.genius:kit:1.5.0'
     compile 'net.qiujuer.genius:res:1.5.0'
-    compile 'net.qiujuer.genius:ui:1.5.2'
+    compile 'net.qiujuer.genius:ui:1.6.0'
 }

caprice/sample/src/main/AndroidManifest.xml

@@ -31,7 +31,7 @@
         <activity
             android:name=".KitActivity"
             android:label="@string/title_activity_kit" />
-        <activity android:name=".SeekBarActivity"></activity>
+        <activity android:name=".SeekBarActivity" />
     </application>
 
 </manifest>

caprice/sample/src/main/java/net/qiujuer/sample/genius/BlurActivity.java

@@ -4,9 +4,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
@@ -27,6 +26,13 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_blur);
 
+        // init bar
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
+
         initBlur();
     }
 
@@ -148,27 +154,9 @@ public void run() {
         });
     }
 
-
     @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_blur, menu);
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
         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_back) {
-            finish();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
 }

caprice/sample/src/main/java/net/qiujuer/sample/genius/KitActivity.java

@@ -1,9 +1,8 @@
 package net.qiujuer.sample.genius;
 
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
@@ -37,6 +36,12 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_kit);
 
+        // init bar
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
 
         // Init to use
         // 初始化使用
@@ -372,30 +377,6 @@ public void run() {
         thread.start();
     }
 
-
-    @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_kit, 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_back) {
-            finish();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
     private boolean mRunAsyncThread = false;
     private boolean mRunSyncThread = false;
 
@@ -477,5 +458,9 @@ public long getCount() {
         }
     }
 
-
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
+    }
 }

caprice/sample/src/main/java/net/qiujuer/sample/genius/MainActivity.java

@@ -2,8 +2,6 @@
 
 import android.content.Intent;
 import android.content.res.Resources;
-import android.graphics.Paint;
-import android.graphics.drawable.ShapeDrawable;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -19,7 +17,6 @@
 import net.qiujuer.genius.ui.widget.FloatActionButton;
 import net.qiujuer.genius.ui.widget.Loading;
 import net.qiujuer.genius.ui.widget.TextView;
-import net.qiujuer.sample.genius.drawable.AddLineShape;
 
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener, Toolbar.OnMenuItemClickListener {
@@ -77,20 +74,7 @@ private void initToolbar() {
     }
 
     private void initFloatActionButton() {
-        final float density = getResources().getDisplayMetrics().density;
         FloatActionButton addButton = (FloatActionButton) findViewById(R.id.action_add);
-        AddLineShape lineShape = new AddLineShape();
-        ShapeDrawable drawable = new ShapeDrawable(lineShape);
-        Paint paint = drawable.getPaint();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setAntiAlias(true);
-        paint.setDither(true);
-        paint.setColor(0xc0ffffff);
-        paint.setStrokeCap(Paint.Cap.ROUND);
-        paint.setStrokeWidth(2 * density);
-        drawable.setIntrinsicWidth(100);
-        drawable.setIntrinsicHeight(100);
-        addButton.setImageDrawable(drawable);
         addButton.setOnClickListener(this);
     }
 

caprice/sample/src/main/java/net/qiujuer/sample/genius/SeekBarActivity.java

@@ -1,6 +1,7 @@
 package net.qiujuer.sample.genius;
 
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
@@ -20,6 +21,13 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_seek_bar);
 
+        // init bar
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
+
         mMin = (EditText) findViewById(R.id.edit_min);
         mMax = (EditText) findViewById(R.id.edit_max);
         mStatus = (TextView) findViewById(R.id.tv_status);
@@ -48,10 +56,20 @@ public void onStopTrackingTouch(SeekBar seekBar) {
         mBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                int min = Integer.valueOf(mMin.getText().toString());
+                int min = 0;
+                try {
+                    min = Integer.valueOf(mMin.getText().toString());
+                } catch (NumberFormatException e) {
+                    mMin.setText(String.valueOf(0));
+                }
                 mBar.setMin(min);
 
-                int max = Integer.valueOf(mMax.getText().toString());
+                int max = 0;
+                try {
+                    max = Integer.valueOf(mMax.getText().toString());
+                } catch (NumberFormatException e) {
+                    mMax.setText(String.valueOf(0));
+                }
                 mBar.setMax(max);
 
                 showStatus();
@@ -62,6 +80,12 @@ public void onClick(View v) {
     }
 
     void showStatus() {
-        mStatus.setText(String.format("SeekBar: Min:%s, Max:%s, Progress:%s", mBar.getMin(), mBar.getMax(), mBar.getProgress()));
+        mStatus.setText(String.format("Min:%s, Max:%s, Value:%s", mBar.getMin(), mBar.getMax(), mBar.getProgress()));
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
     }
 }

caprice/sample/src/main/res/drawable/m_ic_add.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>

caprice/sample/src/main/res/layout/activity_main.xml

@@ -16,7 +16,7 @@
             android:paddingBottom="@dimen/lay_32"
             android:paddingLeft="@dimen/lay_12"
             android:paddingRight="@dimen/lay_12"
-            android:paddingTop="@dimen/abc_action_bar_default_height_material">
+            android:paddingTop="@dimen/size_56">
 
             <net.qiujuer.genius.ui.widget.TextView
                 android:layout_width="wrap_content"
@@ -496,10 +496,10 @@
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/title"
+        style="@style/ToolBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="@dimen/abc_action_bar_default_height_material"
-        android:paddingBottom="@dimen/lay_16" />
+        android:paddingBottom="@dimen/lay_8" />
 
     <net.qiujuer.genius.ui.widget.FloatActionButton
         android:id="@+id/action_add"
@@ -509,6 +509,8 @@
         android:layout_alignParentRight="true"
         android:layout_marginBottom="@dimen/lay_16"
         android:layout_marginRight="@dimen/lay_16"
+        android:padding="@dimen/lay_16"
+        android:src="@drawable/m_ic_add"
         app:gBackgroundColor="@color/cyan_500"
         app:gTouchColor="@color/black_alpha_64"
         tools:ignore="RtlHardcoded" />

caprice/sample/src/main/res/layout/activity_seek_bar.xml

@@ -13,9 +13,14 @@
 
     <net.qiujuer.genius.ui.widget.TextView
         android:id="@+id/tv_status"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="SeekBar: Min:0, Max:10, Progress:0" />
+        android:layout_marginBottom="@dimen/lay_36"
+        android:layout_marginTop="@dimen/lay_16"
+        android:gravity="center"
+        android:text="Min:0, Max:10, Progress:0aa"
+        android:textColor="@color/orange_800"
+        android:textSize="@dimen/font_18" />
 
     <net.qiujuer.genius.ui.widget.SeekBar
         android:id="@+id/seekBar"