diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd1a645..36b1faf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,13 +9,19 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + + + \ No newline at end of file diff --git a/app/src/main/java/tech/iosd/calculaterhacktober/MainActivity.java b/app/src/main/java/tech/iosd/calculaterhacktober/MainActivity.java index a0cb52b..c4f1f73 100644 --- a/app/src/main/java/tech/iosd/calculaterhacktober/MainActivity.java +++ b/app/src/main/java/tech/iosd/calculaterhacktober/MainActivity.java @@ -3,6 +3,8 @@ import android.content.Intent; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -260,9 +262,26 @@ public void onClick(View view) { }); } -// public void scientific(View view) -// { -// startActivity(new Intent(this,scientificCalc.class)); -// } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.mainmenu, menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + + switch (item.getItemId()){ + case R.id.ac_scientific: + + break; + + case R.id.ac_about: + break; + } + + return super.onOptionsItemSelected(item); + } } diff --git a/app/src/main/java/tech/iosd/calculaterhacktober/Splash.java b/app/src/main/java/tech/iosd/calculaterhacktober/Splash.java new file mode 100644 index 0000000..cc10459 --- /dev/null +++ b/app/src/main/java/tech/iosd/calculaterhacktober/Splash.java @@ -0,0 +1,25 @@ +package tech.iosd.calculaterhacktober; + +import android.content.Intent; +import android.os.Handler; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class Splash extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splash); + + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + finish(); + startActivity(new Intent( + Splash.this, MainActivity.class + )); + } + }, 1500); + } +} diff --git a/app/src/main/res/drawable/a.jpg b/app/src/main/res/drawable/a.jpg new file mode 100644 index 0000000..6163f35 Binary files /dev/null and b/app/src/main/res/drawable/a.jpg differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1376ff9..fcdc452 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,13 +5,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/backgroundColor" android:orientation="vertical" tools:layout_editor_absoluteX="8dp" tools:layout_editor_absoluteY="0dp"> + + + + + diff --git a/app/src/main/res/menu/mainmenu.xml b/app/src/main/res/menu/mainmenu.xml new file mode 100644 index 0000000..5582dfa --- /dev/null +++ b/app/src/main/res/menu/mainmenu.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5885930..2c0e890 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -7,5 +7,11 @@ @color/colorPrimaryDark @color/colorAccent +