Merge pull request #32 from JLindemann42/development

v2.0.2-Build61

Author: JLindemann42

app/release/atomic-v200-b61.aab

@@ -80,5 +80,7 @@ object EquationModel {
         equation.add(Equation("Activity #2", "Nuclear Physics", R.drawable.e_activity2, "A: Activity at time 0 \nA(0): Activity at time 0 \nlambda: Decay Constant \nt: Time"))
         equation.add(Equation("Absorbed Dose", "Nuclear Physics", R.drawable.e_absorbeddose, "D: Absorbed Dose \nE: Energy \nm: Mass"))
         equation.add(Equation("Equivalent Dose", "Nuclear Physics", R.drawable.e_equivalentdose, "H: Equivalent Dose \nD: Absorbed Dose \nQ: Quality Factor"))
+        equation.add(Equation("Energy in Capacitor", "Electricity", R.drawable., ""))
+
     }
 }

app/src/main/java/com/jlindemann/science/model/EquationModel.kt

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/chipSurfaceColor"/>
+    <corners android:radius="4dp"/>
+</shape>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/actionMenuTextColor">
+    <item
+        android:id="@android:id/mask"
+        android:gravity="center">
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/rippleColor"/>
+            <corners android:radius="4dp"/>
+        </shape>
+    </item>
+</ripple>

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

@@ -4,10 +4,11 @@
     android:id="@+id/item_nuclide_frame"
     android:layout_width="32dp"
     android:layout_height="32dp"
-    android:background="@drawable/toast"
+    android:background="@drawable/toast_nuclide"
+    android:backgroundTint="?attr/colorSurfaceVariant"
     android:foreground="@drawable/c_ripple"
     android:clickable="true"
-    android:elevation="2dp"
+    android:elevation="0dp"
     android:focusable="true">
 
         <TextView