diff --git a/app/build.gradle b/app/build.gradle
index ad0e04c..9abe72a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
buildToolsVersion "29.0.2"
defaultConfig {
applicationId "be.bitscuit.calendar"
- minSdkVersion 15
+ minSdkVersion 16
targetSdkVersion 29
versionCode 5
versionName "1.1.1"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cb239c1..f05f7cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,11 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
-
+
.
+ */
+
+package be.bitscuit.calendar.Activities;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.widget.TextView;
+
+import be.bitscuit.calendar.BuildConfig;
+import be.bitscuit.calendar.R;
+import be.bitscuit.calendar.Util.TaskData;
+import be.bitscuit.calendar.Util.Util;
+
+public class AboutActivity extends AppCompatActivity {
+
+ private Toolbar toolbar;
+ private TextView textVersion;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_about);
+
+ //Set toolbar
+ toolbar = findViewById(R.id.about_toolbar);
+ setSupportActionBar(toolbar);
+ setTitle("About");
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setDisplayHomeAsUpEnabled(true);
+
+ // Init views
+ textVersion = findViewById(R.id.about_text_version);
+
+ // Set views
+ textVersion.setText("Version: "+ BuildConfig.VERSION_NAME +"\nBuild: "+BuildConfig.VERSION_CODE);
+
+ }
+
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+
+ case android.R.id.home:
+ onBackPressed();
+ return true;
+
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
+ @Override
+ public void onBackPressed() {
+ //Close activity
+ this.finish();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/bitscuit/calendar/Activities/MainActivity.java b/app/src/main/java/be/bitscuit/calendar/Activities/MainActivity.java
index 44ed1db..b01bf0b 100644
--- a/app/src/main/java/be/bitscuit/calendar/Activities/MainActivity.java
+++ b/app/src/main/java/be/bitscuit/calendar/Activities/MainActivity.java
@@ -157,6 +157,11 @@ public class MainActivity extends AppCompatActivity
startActivity(intent);
return true;
+ case R.id.main_menu_about:
+ Intent i = new Intent(this, AboutActivity.class);
+ startActivity(i);
+ return true;
+
case R.id.main_menu_date:
//Show date picker
DialogFragment fragment = new DatePickerFragment(this);
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
new file mode 100644
index 0000000..5d1615c
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e69550b..6718afc 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -116,21 +116,6 @@
app:layout_constraintStart_toEndOf="@+id/settings_label_overview_time"
app:layout_constraintTop_toBottomOf="@+id/settings_switch_overview" />
-
-
+
+