From a18e52bf1a1c9ca077ff58bff0c6ac71082cf37c Mon Sep 17 00:00:00 2001 From: WillWcchan Date: Sun, 19 Jul 2020 23:22:41 -0700 Subject: [PATCH] Added a disclaimer page --- app/src/main/AndroidManifest.xml | 14 ++++- .../simple_random_stock/MainActivity.java | 5 ++ .../activities/DisclaimerActivity.java | 35 +++++++++++++ app/src/main/res/drawable/ic_warning.xml | 10 ++++ app/src/main/res/layout/activity_about.xml | 1 - .../main/res/layout/activity_disclaimer.xml | 52 +++++++++++++++++++ app/src/main/res/menu/menu_file.xml | 5 ++ app/src/main/res/values/strings.xml | 6 +++ 8 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/willchan/simple_random_stock/activities/DisclaimerActivity.java create mode 100644 app/src/main/res/drawable/ic_warning.xml create mode 100644 app/src/main/res/layout/activity_disclaimer.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9ade5b0..19ebbce 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,15 +9,26 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"> + + + + + + + + - @@ -27,6 +38,7 @@ android:name="android.support.PARENT_ACTIVITY" android:value="com.willchan.simple_random_stock.MainActivity" /> + diff --git a/app/src/main/java/com/willchan/simple_random_stock/MainActivity.java b/app/src/main/java/com/willchan/simple_random_stock/MainActivity.java index 14043f9..b7ef1ca 100644 --- a/app/src/main/java/com/willchan/simple_random_stock/MainActivity.java +++ b/app/src/main/java/com/willchan/simple_random_stock/MainActivity.java @@ -14,6 +14,7 @@ import com.google.android.material.tabs.TabLayout; import com.willchan.simple_random_stock.activities.AboutActivity; +import com.willchan.simple_random_stock.activities.DisclaimerActivity; import com.willchan.simple_random_stock.adapters.TabLayoutAdapter; import com.willchan.simple_random_stock.fragments.IndexFragment; import com.willchan.simple_random_stock.viewmodels.StockViewModel; @@ -82,6 +83,10 @@ public boolean onOptionsItemSelected(MenuItem item) { if (stockViewModel != null) stockViewModel.deleteAllStocks(); return true; + } else if (item.getItemId() == R.id.disclaimer) { + Intent intent = new Intent(this, DisclaimerActivity.class); + startActivity(intent); + return true; } else { return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/com/willchan/simple_random_stock/activities/DisclaimerActivity.java b/app/src/main/java/com/willchan/simple_random_stock/activities/DisclaimerActivity.java new file mode 100644 index 0000000..bb27cd2 --- /dev/null +++ b/app/src/main/java/com/willchan/simple_random_stock/activities/DisclaimerActivity.java @@ -0,0 +1,35 @@ +package com.willchan.simple_random_stock.activities; + +import android.os.Bundle; +import android.util.Log; + +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.willchan.simple_random_stock.R; + +public class DisclaimerActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_disclaimer); + + // Source: https://developer.android.com/training/appbar/up-action + Toolbar toolBar = findViewById(R.id.toolbar); + setSupportActionBar(toolBar); + + // Get a support Actionbar corresponding to this toolbar + ActionBar ab = getSupportActionBar(); + + // Enable the Up Button + if (ab != null) { + try { + ab.setDisplayHomeAsUpEnabled(true); + } catch (NullPointerException e) { + Log.e(DisclaimerActivity.this.getLocalClassName(), "Unable to set Up Action"); + } + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml new file mode 100644 index 0000000..968cb29 --- /dev/null +++ b/app/src/main/res/drawable/ic_warning.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 1d3d89a..2f10f40 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -134,5 +134,4 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/supportTexView" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_disclaimer.xml b/app/src/main/res/layout/activity_disclaimer.xml new file mode 100644 index 0000000..6a16ff3 --- /dev/null +++ b/app/src/main/res/layout/activity_disclaimer.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_file.xml b/app/src/main/res/menu/menu_file.xml index 73a94b6..13e23a5 100644 --- a/app/src/main/res/menu/menu_file.xml +++ b/app/src/main/res/menu/menu_file.xml @@ -16,6 +16,11 @@ android:id="@+id/about" android:icon="@drawable/ic_info" android:title="@string/about" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a9813e..2a9e9f9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -38,5 +38,11 @@ https://join.robinhood.com/williac1866 + Disclaimer + Simple Random Stock is for fun and + educational purposes only. This application should not be viewed as + financial advice or stock recommendation to buy, sell, or hold any security or investment. + Investors should be cautious about any and all stock recommendations. Please consult + with a professional financial adviser before making any financial decisions.