diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 3b4349f..491aa5e 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -307,8 +307,8 @@
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index f8467b4..6d0ee1c 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
index e2943b3..5257e38 100644
--- a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
index 55b4574..48a27f3 100644
--- a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
@@ -1,9 +1,9 @@
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml
index 67221d0..a4fc9fe 100644
--- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml
@@ -1,12 +1,12 @@
-
+
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
index c08388c..fc0f2f7 100644
--- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
index 06cd49f..a7d7e93 100644
--- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
index 704bc1b..5e023a9 100644
--- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
index 088cf8e..97dede4 100644
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
index d6fe4b0..bae5567 100644
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
index 243a15c..9ef4fc0 100644
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
index e96783b..2718db6 100644
--- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
index 2ccd400..f94d91d 100644
--- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
index 75cf90a..8df4609 100644
--- a/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
@@ -1,12 +1,12 @@
-
+
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
index 7d704a1..af9cd3c 100644
--- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
@@ -1,11 +1,11 @@
-
+
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
index 5124cfe..a312ef8 100644
--- a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
@@ -1,12 +1,12 @@
-
+
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
index ec31037..0d807f3 100644
--- a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
index 29ff5f8..49a07f6 100644
--- a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
@@ -1,11 +1,11 @@
-
+
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml
deleted file mode 100644
index 3d59bba..0000000
--- a/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
index 27edc49..12c1acb 100644
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
index 1839f97..40c5b25 100644
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml
index 8d5a99a..3422101 100644
--- a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml
@@ -1,12 +1,12 @@
-
+
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
index 104aaec..e09ffe3 100644
--- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_1_0_aar.xml b/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_1_0_aar.xml
index 3971ea8..95228de 100644
--- a/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_1_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/.idea/libraries/Gradle__com_jaredrummler_material_spinner_1_3_1_aar.xml b/.idea/libraries/Gradle__com_jaredrummler_material_spinner_1_3_1_aar.xml
index 0425f26..6808240 100644
--- a/.idea/libraries/Gradle__com_jaredrummler_material_spinner_1_3_1_aar.xml
+++ b/.idea/libraries/Gradle__com_jaredrummler_material_spinner_1_3_1_aar.xml
@@ -1,9 +1,9 @@
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
deleted file mode 100644
index 46341a3..0000000
--- a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__de_hdodenhof_circleimageview_3_1_0_aar.xml b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_3_1_0_aar.xml
index fbd41e6..4a919ea 100644
--- a/.idea/libraries/Gradle__de_hdodenhof_circleimageview_3_1_0_aar.xml
+++ b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_3_1_0_aar.xml
@@ -1,9 +1,9 @@
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
deleted file mode 100644
index 7c99fb6..0000000
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a2717ef..6aea7b9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,10 @@
+
+
+
-
-
-
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedAdapter.java
index c4ad6be..82004df 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedAdapter.java
@@ -82,7 +82,7 @@ public void onClick(View view) {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
R.style.BottomSheetDialogTheme);
final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
- inflate(R.layout.update_layout_bottom_sheet,
+ inflate(R.layout.update_layout_bottom_sheet_test,
view.findViewById(R.id.bottomsheetContainer));
final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java
index 626cfbd..de34874 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java
@@ -82,7 +82,7 @@ public void onClick(View view) {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
R.style.BottomSheetDialogTheme);
final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
- inflate(R.layout.update_layout_bottom_sheet,
+ inflate(R.layout.update_layout_bottom_sheet_test,
view.findViewById(R.id.bottomsheetContainer));
final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneAdapter.java
index 34c6992..4b0847e 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneAdapter.java
@@ -82,7 +82,7 @@ public void onClick(View view) {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
R.style.BottomSheetDialogTheme);
final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
- inflate(R.layout.update_layout_bottom_sheet,
+ inflate(R.layout.update_layout_bottom_sheet_test,
view.findViewById(R.id.bottomsheetContainer));
final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java
index 024b685..bc72155 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java
@@ -79,7 +79,7 @@ public void onClick(View view) {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
R.style.BottomSheetDialogTheme);
final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
- inflate(R.layout.update_layout_bottom_sheet,
+ inflate(R.layout.update_layout_bottom_sheet_test,
view.findViewById(R.id.bottomsheetContainer));
final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java
index 1acc17f..b9bea9b 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java
@@ -77,7 +77,7 @@ public void onBindViewHolder(@NonNull final HabitsAdapter.RecyclerViewHolder hol
@Override
public void onClick(View view) {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con, R.style.BottomSheetDialogTheme);
- final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).inflate(R.layout.update_layout_bottom_sheet, view.findViewById(R.id.bottomsheetContainer));
+ final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).inflate(R.layout.update_layout_bottom_sheet_test, view.findViewById(R.id.bottomsheetContainer));
final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsLogAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsLogAdapter.java
index 576e9b4..ec715ad 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsLogAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsLogAdapter.java
@@ -79,9 +79,9 @@ public void onClick(View view) {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
R.style.BottomSheetDialogTheme);
final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
- inflate(R.layout.update_layout_bottom_sheet,
+ inflate(R.layout.update_layout_bottom_sheet_test,
view.findViewById(R.id.bottomsheetContainer));
- final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
+ /* final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
@@ -94,7 +94,7 @@ public void onClick(View view) {
spinner.setVisibility(View.VISIBLE);
}
habit.setText("" + Helper.habitsdata.get(position)[2]);
- detail.setText("" + Helper.habitsdata.get(position)[3]);
+ detail.setText("" + Helper.habitsdata.get(position)[3]);*/
final Adapter adapter = new ArrayAdapter(con, android.R.layout.simple_list_item_1,
Helper.labels_array) {
@Override
@@ -103,41 +103,41 @@ public boolean isEnabled(int position) {
}
};
- spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
- @Override
- public void onItemSelected(AdapterView> adapterView, View view, int i, long l) {
- catagoryselected = adapterView.getItemAtPosition(i).toString();
- TextView selectedText = (TextView) adapterView.getChildAt(i);
- if (selectedText != null) {
- selectedText.setTextColor(ContextCompat.getColor(con, R.color.g2));
- }
- }
-
- @Override
- public void onNothingSelected(AdapterView> adapterView) {
-
- }
- });
- saveTaskButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- String formattedDate = df.format(c);
- try {
-
- } catch (SQLiteException e) {
- }
- db.update_habitsdata(position, formattedDate, habit.getText().toString()
- , detail.getText().toString(), catagoryselected);
- db.show_habits_data();
- Intent intent = new Intent(con, MainActivity.class);
- con.startActivity(intent);
- ((Activity) con).overridePendingTransition(0, 0);
- bottomSheetDialog.dismiss();
- }
-
- });
-
- spinner.setAdapter((SpinnerAdapter) adapter);
+// spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+// @Override
+// public void onItemSelected(AdapterView> adapterView, View view, int i, long l) {
+// catagoryselected = adapterView.getItemAtPosition(i).toString();
+// TextView selectedText = (TextView) adapterView.getChildAt(i);
+// if (selectedText != null) {
+// selectedText.setTextColor(ContextCompat.getColor(con, R.color.g2));
+// }
+// }
+//
+// @Override
+// public void onNothingSelected(AdapterView> adapterView) {
+//
+// }
+// });
+// saveTaskButton.setOnClickListener(new View.OnClickListener() {
+// @Override
+// public void onClick(View view) {
+// String formattedDate = df.format(c);
+// try {
+//
+// } catch (SQLiteException e) {
+// }
+// db.update_habitsdata(position, formattedDate, habit.getText().toString()
+// , detail.getText().toString(), catagoryselected);
+// db.show_habits_data();
+// Intent intent = new Intent(con, MainActivity.class);
+// con.startActivity(intent);
+// ((Activity) con).overridePendingTransition(0, 0);
+// bottomSheetDialog.dismiss();
+// }
+//
+// });
+
+// spinner.setAdapter((SpinnerAdapter) adapter);
bottomSheetDialog.setContentView(bottomsheetview);
bottomSheetDialog.show();
}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java
index 1d955d4..d53907a 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java
@@ -280,7 +280,14 @@ public void onClick(View view) {
}
private void showcaseFab() {
- showcaseViewBuilder.setTargetView(floatingActionButton).setBackgroundOverlayColor(0xcc000000).setBgOverlayShape(ShowcaseViewBuilder.ROUND_RECT).setRoundRectCornerDirection(ShowcaseViewBuilder.TOP_RIGHT).setRoundRectOffset(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 170, getResources().getDisplayMetrics())).setRingColor(0xcc8e8e8e).setShowcaseShape(ShowcaseViewBuilder.SHAPE_CIRCLE).setRingWidth(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 18, getResources().getDisplayMetrics())).setMarkerDrawable(getResources().getDrawable(R.drawable.arrow_up), Gravity.LEFT).addCustomView(R.layout.fab_description_view, Gravity.LEFT, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 0, getResources().getDisplayMetrics()), TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -228, getResources().getDisplayMetrics()), TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -220, getResources().getDisplayMetrics()), 0);
+ showcaseViewBuilder.setTargetView(floatingActionButton).setBackgroundOverlayColor(0xcc000000)
+ .setBgOverlayShape(ShowcaseViewBuilder.ROUND_RECT)
+ .setRoundRectCornerDirection(ShowcaseViewBuilder.TOP_RIGHT)
+ .setRoundRectOffset(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 170, getResources().getDisplayMetrics())).setRingColor(0xcc8e8e8e)
+ .setShowcaseShape(ShowcaseViewBuilder.SHAPE_CIRCLE).setRingWidth(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 18, getResources().getDisplayMetrics()))
+ .setMarkerDrawable(getResources().getDrawable(R.drawable.arrow_up), Gravity.LEFT)
+ .addCustomView(R.layout.fab_description_view, Gravity.LEFT, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 0, getResources().getDisplayMetrics()), TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, -228, getResources()
+ .getDisplayMetrics()), TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 100, getResources().getDisplayMetrics()), -300);
// .addCustomView(R.layout.fab_description_view, Gravity.CENTER);
showcaseViewBuilder.show();
diff --git a/app/src/main/java/rocks/poopjournal/todont/Settings.java b/app/src/main/java/rocks/poopjournal/todont/Settings.java
index cd23694..2541676 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Settings.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Settings.java
@@ -105,7 +105,6 @@ public void changeMode(View view) {
if(getmodetitle.equals("Dracula")){
dracula.setChecked(true);
}
-
WindowManager.LayoutParams lp = d.getWindow().getAttributes();
lp.dimAmount=0.9f;
d.getWindow().setAttributes(lp);
diff --git a/app/src/main/res/drawable/bottom_sheet.xml b/app/src/main/res/drawable/bottom_sheet.xml
index 04df7ac..03d5ecf 100644
--- a/app/src/main/res/drawable/bottom_sheet.xml
+++ b/app/src/main/res/drawable/bottom_sheet.xml
@@ -1,7 +1,7 @@
-
+
+
+
+
+
diff --git a/app/src/main/res/drawable/frame__5_.xml b/app/src/main/res/drawable/frame__5_.xml
new file mode 100644
index 0000000..02b2dc2
--- /dev/null
+++ b/app/src/main/res/drawable/frame__5_.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/frame__6_.xml b/app/src/main/res/drawable/frame__6_.xml
new file mode 100644
index 0000000..a23f7cb
--- /dev/null
+++ b/app/src/main/res/drawable/frame__6_.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/rounded_button.xml b/app/src/main/res/drawable/rounded_button.xml
new file mode 100644
index 0000000..8905873
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_button.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/trash.xml b/app/src/main/res/drawable/trash.xml
new file mode 100644
index 0000000..fe070fd
--- /dev/null
+++ b/app/src/main/res/drawable/trash.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index cef278b..6e7fbee 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -39,19 +39,16 @@
android:textColor="@color/textcolor"
/>
-
+ android:orientation="horizontal"
+ android:layout_height="wrap_content">
+
+
+
+
+
+
+
+
+
@@ -154,12 +181,124 @@
-
+ android:layout_height="70dp"
+ android:elevation="5dp"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fab_description_view.xml b/app/src/main/res/layout/fab_description_view.xml
index 2b3b462..277b804 100644
--- a/app/src/main/res/layout/fab_description_view.xml
+++ b/app/src/main/res/layout/fab_description_view.xml
@@ -12,7 +12,7 @@
android:text="TO add task!"
android:visibility="gone"
android:textColor="@android:color/holo_blue_bright"
- android:textSize="18sp"
+ android:textSize="14sp"
android:textStyle="bold"
/>
diff --git a/app/src/main/res/layout/fab_label_description_view.xml b/app/src/main/res/layout/fab_label_description_view.xml
index f549152..5a95799 100644
--- a/app/src/main/res/layout/fab_label_description_view.xml
+++ b/app/src/main/res/layout/fab_label_description_view.xml
@@ -33,7 +33,7 @@
android:layout_below="@+id/textView"
android:text="This button is to add label which would be use later to add task.."
android:textColor="@android:color/holo_blue_bright"
- android:textSize="14sp" />
+ android:textSize="12sp" />