diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a357275..29a1a45 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,30 +25,29 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
@@ -83,14 +82,14 @@
-
-
+
+
-
-
+
+
-
+
@@ -99,20 +98,21 @@
-
-
+
+
+
-
-
+
+
-
-
+
+
@@ -121,43 +121,75 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1533,7 +1565,7 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -2011,6 +2044,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2634,25 +2757,32 @@
1474709769738
-
+
+ 1474733865498
+
+
+
+ 1474733865498
+
+
-
+
-
+
-
+
-
+
@@ -2662,7 +2792,7 @@
-
+
@@ -2680,6 +2810,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2729,30 +2900,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2782,28 +2929,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2828,30 +2953,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2877,99 +2978,114 @@
-
+
-
-
-
+
+
-
-
-
-
+
-
-
+
+
-
-
-
-
+
-
-
+
+
-
+
-
-
+
+
-
+
+
-
+
+
+
+
+
+
-
-
+
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
@@ -2977,10 +3093,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2988,52 +3123,48 @@
-
+
-
-
+
+
-
+
-
-
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
-
-
+
+
+
+
+
-
+
-
-
+
+
@@ -3041,71 +3172,112 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
+
+
+
-
-
+
+
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 1a80dcb..2bf9216 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -66,14 +66,6 @@
-
-
-
-
-
-
-
-
@@ -82,6 +74,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index b22d045..43d568a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
applicationId "com.njzjz.chemicaltools"
minSdkVersion 15
targetSdkVersion 23
- versionCode 6
- versionName "1.5"
+ versionCode 7
+ versionName "1.51"
}
buildTypes {
release {
diff --git a/app/src/main/java/com/njzjz/chemicaltools/ExamActivity.java b/app/src/main/java/com/njzjz/chemicaltools/ExamActivity.java
index ab1cdc9..b1ffbd0 100644
--- a/app/src/main/java/com/njzjz/chemicaltools/ExamActivity.java
+++ b/app/src/main/java/com/njzjz/chemicaltools/ExamActivity.java
@@ -1,6 +1,7 @@
package com.njzjz.chemicaltools;
import android.content.Intent;
+import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
@@ -15,6 +16,8 @@
import android.widget.EditText;
import android.widget.TextView;
+import com.mikepenz.aboutlibraries.Libs;
+
public class ExamActivity extends AppCompatActivity {
@Override
@@ -170,6 +173,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.action_settings:
openSettings();
return true;
+ case R.id.action_Feedback:
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("mailto:njzjz@msn.com?subject=Chemical Tools App Feedback"));
+ startActivity(browserIntent);
+ return true;
+ case R.id.action_About:
+ new Libs.Builder().withActivityTitle(getString(R.string.button_About)).withFields(R.string.class.getFields()).start(ExamActivity.this);
+ return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/java/com/njzjz/chemicaltools/MainActivity.java b/app/src/main/java/com/njzjz/chemicaltools/MainActivity.java
index b2a4b87..9bc5f1c 100644
--- a/app/src/main/java/com/njzjz/chemicaltools/MainActivity.java
+++ b/app/src/main/java/com/njzjz/chemicaltools/MainActivity.java
@@ -3,6 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
+import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v7.app.ActionBar;
@@ -19,6 +20,8 @@
import android.widget.EditText;
import android.widget.TextView;
+import com.mikepenz.aboutlibraries.Libs;
+
public class MainActivity extends AppCompatActivity {
@Override
@@ -120,6 +123,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.action_settings:
openSettings();
return true;
+ case R.id.action_Feedback:
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("mailto:njzjz@msn.com?subject=Chemical Tools App Feedback"));
+ startActivity(browserIntent);
+ return true;
+ case R.id.action_About:
+ new Libs.Builder().withActivityTitle(getString(R.string.button_About)).withFields(R.string.class.getFields()).start(MainActivity.this);
+ return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/java/com/njzjz/chemicaltools/MassActivity.java b/app/src/main/java/com/njzjz/chemicaltools/MassActivity.java
index 1f12542..f31700c 100644
--- a/app/src/main/java/com/njzjz/chemicaltools/MassActivity.java
+++ b/app/src/main/java/com/njzjz/chemicaltools/MassActivity.java
@@ -3,6 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
+import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v7.app.ActionBar;
@@ -19,6 +20,8 @@
import android.widget.EditText;
import android.widget.TextView;
+import com.mikepenz.aboutlibraries.Libs;
+
public class MassActivity extends AppCompatActivity {
@Override
@@ -271,6 +274,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.action_settings:
openSettings();
return true;
+ case R.id.action_Feedback:
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("mailto:njzjz@msn.com?subject=Chemical Tools App Feedback"));
+ startActivity(browserIntent);
+ return true;
+ case R.id.action_About:
+ new Libs.Builder().withActivityTitle(getString(R.string.button_About)).withFields(R.string.class.getFields()).start(MassActivity.this);
+ return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/java/com/njzjz/chemicaltools/TitleActivity.java b/app/src/main/java/com/njzjz/chemicaltools/TitleActivity.java
index 77b73e0..0a5b766 100644
--- a/app/src/main/java/com/njzjz/chemicaltools/TitleActivity.java
+++ b/app/src/main/java/com/njzjz/chemicaltools/TitleActivity.java
@@ -18,6 +18,7 @@
import com.ikimuhendis.ldrawer.ActionBarDrawerToggle;
import com.ikimuhendis.ldrawer.DrawerArrowDrawable;
+import com.mikepenz.aboutlibraries.Libs;
public class TitleActivity extends AppCompatActivity {
public final static String EXTRA_MESSAGE = "com.njzjz.chemicalTools.MESSAGE";
@@ -82,9 +83,10 @@ public void onDrawerOpened(View drawerView) {
res.getString(R.string.button_element),
res.getString(R.string.button_mass),
res.getString(R.string.button_exam),
- res.getString(R.string.button_Settings),
res.getString(R.string.button_Share),
- res.getString(R.string.button_Github),
+ res.getString(R.string.button_Settings),
+ res.getString(R.string.setting_feedback),
+ res.getString(R.string.button_About),
};
ArrayAdapter adapter = new ArrayAdapter(this,
android.R.layout.simple_list_item_1, android.R.id.text1, values);
@@ -103,11 +105,11 @@ public void onItemClick(AdapterView parent, View view,
openMass(view);
break;
case 5:
- //Github
- Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/njzjz/Chemical-Tools-for-Android"));
+ //Feedback
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("mailto:njzjz@msn.com?subject=Chemical Tools App Feedback"));
startActivity(browserIntent);
break;
- case 4:
+ case 3:
//Share
Intent share = new Intent(Intent.ACTION_SEND);
share.setType("text/plain");
@@ -123,12 +125,13 @@ public void onItemClick(AdapterView parent, View view,
//Exam
openExam(view);
break;
- case 3:
+ case 4:
//Settings
openSettings();
break;
case 6:
-
+ //About
+ new Libs.Builder().withActivityTitle(getString(R.string.button_About)).withFields(R.string.class.getFields()).start(TitleActivity.this);
break;
}
@@ -161,6 +164,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.action_settings:
openSettings();
return true;
+ case R.id.action_Feedback:
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("mailto:njzjz@msn.com?subject=Chemical Tools App Feedback"));
+ startActivity(browserIntent);
+ return true;
+ case R.id.action_About:
+ new Libs.Builder().withActivityTitle(getString(R.string.button_About)).withFields(R.string.class.getFields()).start(TitleActivity.this);
+ return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/res/drawable/element.jpg b/app/src/main/res/drawable/element.jpg
deleted file mode 100644
index fd63221..0000000
Binary files a/app/src/main/res/drawable/element.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/mass.jpg b/app/src/main/res/drawable/mass.jpg
deleted file mode 100644
index 4dae119..0000000
Binary files a/app/src/main/res/drawable/mass.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/selectable_background.xml b/app/src/main/res/drawable/selectable_background.xml
index 81b9fe3..cb44b5d 100644
--- a/app/src/main/res/drawable/selectable_background.xml
+++ b/app/src/main/res/drawable/selectable_background.xml
@@ -2,26 +2,26 @@
-
-
+
-
-
+
-
-
+
-
-
+
diff --git a/app/src/main/res/drawable/shadow_drawable.xml b/app/src/main/res/drawable/shadow_drawable.xml
new file mode 100644
index 0000000..399a204
--- /dev/null
+++ b/app/src/main/res/drawable/shadow_drawable.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d382525..d248a13 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -54,7 +54,7 @@
android:id="@+id/elementTextview"
android:layout_weight="0.06"
android:text="@string/elementTextview_name"
- android:textSize="25dp"
+ android:textSize="18dp"
android:textColor="@color/abc_primary_text_material_light"
android:scrollbars="vertical"
/>
diff --git a/app/src/main/res/layout/activity_mass.xml b/app/src/main/res/layout/activity_mass.xml
index 1b0b308..3146e97 100644
--- a/app/src/main/res/layout/activity_mass.xml
+++ b/app/src/main/res/layout/activity_mass.xml
@@ -43,7 +43,7 @@
android:id="@+id/massTextview"
android:layout_weight="0.06"
android:text="@string/massTextview_name"
- android:textSize="25dp"
+ android:textSize="18dp"
android:textColor="@color/abc_primary_text_material_light"
android:layout_below="@+id/relativeLayout1"
android:layout_centerHorizontal="true"
diff --git a/app/src/main/res/layout/list_item_card.xml b/app/src/main/res/layout/list_item_card.xml
index c1358c9..eb7ea3d 100644
--- a/app/src/main/res/layout/list_item_card.xml
+++ b/app/src/main/res/layout/list_item_card.xml
@@ -13,7 +13,7 @@
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
+ android:layout_marginTop="8dp"
>
-
+
+ />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/mainmenu.xml b/app/src/main/res/menu/mainmenu.xml
index d4b99ff..0a55ea3 100644
--- a/app/src/main/res/menu/mainmenu.xml
+++ b/app/src/main/res/menu/mainmenu.xml
@@ -6,12 +6,20 @@
- From the Greek oxy-, both sharp and acid, and -gen, meaning acid-forming
- The Latin fluere, to flow
- The Greek neos, meaning new
- - The English word soda (natrium in Latin)[3]
+ - The English word soda (natrium in Latin)
- Magnesia, a district of Eastern Thessalyin Greece
- From alumina, a compound (originally aluminum)
- From the Latin silex, flint (originally silicium)
- The Greek phoosphoros, carrying light
- - The Latin sulphur, fire and brimstone[5]
+ - The Latin sulphur, fire and brimstone
- The Greek chloros, greenish yellow
- The Greek argos, idle
- - New Latin potassa, potash (kalium in Latin)[3]
+ - New Latin potassa, potash (kalium in Latin)
- The Latin calx, lime
- Scandia, the Latin name for Scandinavia
- Titans, the sons of the Earth goddess of Greek mythology
@@ -554,7 +554,7 @@
- Lutetia, the Latin name for Paris
- Hafnia, the New Latin name for Copenhagen
- King Tantalus, father of Niobe from Greek mythology
- - The Swedish tung sten, heavy stone (W is wolfram, the old name of the tungsten mineral wolframite)[3]
+ - The Swedish tung sten, heavy stone (W is wolfram, the old name of the tungsten mineral wolframite)
- Rhenus, the Latin name for the river Rhine
- The Greek osmè, meaning smell
- Iris, the Greek goddess of the rainbow
@@ -562,7 +562,7 @@
- English word (aurum in Latin)
- The New Latin name mercurius, named after the Roman god (Hg from former name hydrargyrum, from Greek hydr-, water, and argyros, silver)
- The Greek thallos, green twig
- - English word (plumbum in Latin)[3]
+ - English word (plumbum in Latin)
- German word, now obsolete
- Polonia, the New Latin name for Poland
- The Greek astatos, unstable
diff --git a/app/src/main/res/xml/settings_general.xml b/app/src/main/res/xml/settings_general.xml
index 21fb746..8e1d892 100644
--- a/app/src/main/res/xml/settings_general.xml
+++ b/app/src/main/res/xml/settings_general.xml
@@ -57,7 +57,6 @@