implements Serializable {
+
+ private final T map;
+
+ public MapWrapper(@NotNull T map) {
+ this.map = map;
+ }
+
+ public T getMap() {
+ return map;
+ }
+
+ /**
+ * Add extra map data to the intent. The name must include a package prefix, for example
+ * the app com.android.contacts would use names like "com.android.contacts.ShowAll".
+ *
+ * The provided map will be wrapped to preserve its class during serialization.
+ * Use {@link #getMapExtra(Intent, String)} to deserialize it.
+ *
+ * @param intent The intent to add data to.
+ * @param name The name of the extra data, with package prefix.
+ * @param map The map data value.
+ *
+ * @return The same {@link Intent} object, for chaining multiple calls into a single statement.
+ *
+ * @see Intent#putExtra(String, Serializable)
+ */
+ @NotNull
+ public static Intent putMapExtra(
+ @NotNull Intent intent, @NotNull String name, @NotNull T map) {
+ return intent.putExtra(name, new MapWrapper<>(map));
+ }
+
+ /**
+ * Retrieve extra map data from the intent.
+ *
+ * @param intent The intent to retrieve data from.
+ * @param name The name of the desired extra item.
+ *
+ * @return The value of an extra map item that was previously added with
+ * {@link #putMapExtra(Intent, String, Map)} or {@code null} if no data was found.
+ *
+ * @throws ClassCastException
+ * If the {@link Serializable} object with the specified name is not of type
+ * {@link MapWrapper} or if the wrapped {@code Map} is not of type {@link T}.
+ *
+ * @see Intent#getSerializableExtra(String)
+ */
+ @Nullable
+ public static T getMapExtra(
+ @NotNull Intent intent, @NotNull String name)
+ throws ClassCastException {
+ final Serializable s = intent.getSerializableExtra(name);
+ //noinspection unchecked
+ return s == null ? null : ((MapWrapper)s).getMap();
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/color/background.xml b/app/src/main/res/color/background.xml
new file mode 100644
index 0000000..2f40cc6
--- /dev/null
+++ b/app/src/main/res/color/background.xml
@@ -0,0 +1,11 @@
+
+
+
+ - 1
@@ -34,5 +39,56 @@
- Beginner
- Intermediate
+
+ Hello blank fragment
+ 99
+
+
+ - Very Unpleasent
+ - Unpleasent
+ - Neutral
+ - Pleasant
+ - Very Pleasant
+
+
+
+ - Very Tensed
+ - A bit tense
+ - Neutral
+ - Just Calm
+ - Very Calm
+
+ LoginActivity
+ Email
+ Username
+ Password
+ Login
+ Sign in
+ "Welcome !"
+ Not a valid username
+ Password must be >5 characters
+ "Login failed"
+ ARORA
+ press and hold green button - when you breathe in. release the button - when breathing out.
+
+ Profile
+ Practice
+ Learn
+ Community
+ Mindfulness Breathing
+ Mindfulness Meditation
+ Mindfulness Walking
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 61a58d7..b5df2b7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,6 +4,8 @@
- @color/colorPrimary
- @color/colorPrimaryDark
- @color/colorAccent
+ - true
+ - @drawable/dusk_background
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..5fb4773
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 0125c22..0c69996 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.0'
+ classpath 'com.android.tools.build:gradle:4.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index 82618ce..d546dea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a993896..87d196e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 25 15:09:03 MST 2019
+#Mon Mar 15 12:52:36 MST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip