more animations

Author: jiangshen

app/src/main/AndroidManifest.xml

@@ -43,9 +43,7 @@
         <activity
             android:name=".DrawingActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
-
-
+            android:theme="@style/AppTheme.NoActionBar" />
 
     </application>
 

app/src/main/java/com/example/caden/drawingtest/DrawingActivity.java

@@ -7,9 +7,13 @@
 import android.support.constraint.ConstraintLayout;
 import android.support.constraint.ConstraintSet;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.transition.TransitionManager;
 import android.util.TypedValue;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ProgressBar;
@@ -31,7 +35,8 @@
 
 public class DrawingActivity extends AppCompatActivity implements View.OnTouchListener {
 
-    final int dp56 = dpToPx(56);
+    /* Constants */
+    int dp56;
 
     // views
     private DrawModel drawModel;
@@ -49,6 +54,7 @@ public class DrawingActivity extends AppCompatActivity implements View.OnTouchLi
     private FirebaseAuth mAuth;
     private DatabaseReference mDatabase;
 
+    Toolbar toolbar;
     private ProgressBar barSend;
     private FloatingActionButton fabSend;
 
@@ -62,13 +68,16 @@ public class DrawingActivity extends AppCompatActivity implements View.OnTouchLi
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_drawing);
+        toolbar = findViewById(R.id.drawing_toolbar);
+        setSupportActionBar(toolbar);
 
         //get drawing view from XML (where the finger writes the number)
         drawView = findViewById(R.id.draw);
         //get the model object
         drawModel = new DrawModel(PIXEL_WIDTH, PIXEL_WIDTH);
         clDrawMain = findViewById(R.id.cl_draw_main);
         constraintSet.clone(clDrawMain);
+        dp56 = dpToPx(56);
 
         //init the view with the model object
         drawView.setModel(drawModel);
@@ -86,6 +95,28 @@ protected void onCreate(Bundle savedInstanceState) {
         mDatabase = FirebaseDatabase.getInstance().getReference();
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.standard_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.menu_info) {
+            about_screen();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void about_screen() {
+        new AlertDialog.Builder(this)
+                .setMessage(R.string.about_text)
+                .setTitle(R.string.app_name)
+                .setPositiveButton("OK", (dialog, id) -> dialog.cancel())
+                .show();
+    }
+
     @Override
     //OnResume() is called when the user resumes his Activity which he left a while ago,
     // //say he presses home button and then comes back to app, onResume() is called.
@@ -178,21 +209,17 @@ public void clear(View v) {
 
     public void sendImage(View v) {
 
-        int height = findViewById(R.id.cv_drawview).getHeight();
+        int dvHeight = findViewById(R.id.cv_drawview).getHeight();
 
         TransitionManager.beginDelayedTransition(clDrawMain);
         constraintSet.constrainHeight(R.id.fab_send, 0);
         constraintSet.constrainWidth(R.id.fab_send, 0);
         constraintSet.constrainWidth(R.id.pbar_send, dp56);
         constraintSet.constrainHeight(R.id.pbar_send, dp56);
-
         constraintSet.constrainHeight(R.id.cv_drawview, 0);
-
+        constraintSet.constrainHeight(R.id.drawing_ll, dvHeight / 2);
         constraintSet.applyTo(clDrawMain);
 
-
-
-
         Bitmap bmp = drawView.getBitmapData();
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         bmp.compress(Bitmap.CompressFormat.JPEG, 80, baos);
@@ -219,9 +246,9 @@ public void sendImage(View v) {
             constraintSet.constrainHeight(R.id.pbar_send, 0);
             constraintSet.constrainHeight(R.id.fab_send, dp56);
             constraintSet.constrainWidth(R.id.fab_send, dp56);
-            constraintSet.constrainHeight(R.id.cv_drawview, height);
+            constraintSet.constrainHeight(R.id.cv_drawview, dvHeight);
+            constraintSet.constrainHeight(R.id.drawing_ll, 0);
             constraintSet.applyTo(clDrawMain);
-
         });
 
         /* Update Database Reference */

app/src/main/res/drawable/color_primary_gradient.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <gradient
+        android:angle="90"
+        android:endColor="#549eff"
+        android:startColor="#007ee6"
+        android:type="linear" />
+
+</shape>

app/src/main/res/layout/activity_drawing.xml

@@ -8,15 +8,41 @@
     tools:context="com.example.caden.drawingtest.DrawingActivity"
     tools:layout_editor_absoluteY="81dp">
 
+    <LinearLayout
+        android:id="@+id/drawing_ll"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/color_primary_gradient"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/drawing_appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="0dp"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:layout_constraintTop_toBottomOf="@+id/drawing_ll">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/drawing_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+    </android.support.design.widget.AppBarLayout>
+
     <android.support.v7.widget.CardView
         android:id="@+id/cv_drawview"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="0dp"
         app:cardBackgroundColor="#E0E0E0"
         app:cardCornerRadius="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@+id/drawing_appBarLayout">
 
         <com.example.caden.drawingtest.DrawView
             android:id="@+id/draw"

app/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#549eff</color>
-    <color name="colorPrimaryDark">#0070cb</color>
+    <color name="colorPrimaryDark">#0091ea</color>
     <color name="colorAccent">#ff2646</color>
 </resources>