diff --git a/README.md b/README.md index 9155392..a0e9974 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Nex Notes is licensed under the GPLv3 License. Please refer to the LICENSE file ## Downloads -[Get it on F-Droid](https://f-droid.org/packages/com.swatian.nexnotes/) +[Get it on F-Droid](https://f-droid.org/packages/com.swatian.nexnotes/) [Get it on Google Play](https://play.google.com/store/apps/details?id=com.swatian.nexnotes.premium) [Download builds and releases](https://github.com/Swatian/nexnotes/releases) @@ -21,6 +21,7 @@ Nex Notes is licensed under the GPLv3 License. Please refer to the LICENSE file - Biometric lock - Localized - Search by title, content and topic +- Markdown support ## Contributing @@ -41,7 +42,7 @@ We use [Crowdin](https://crowdin.com/project/nexnotes) for translations. If your ## Links -[Website](https://nexnotes.swatian.com/) +[Website](https://nexnotes.swatian.com/) [Wiki](https://github.com/Swatian/nexnotes/wiki/) ## Thanks diff --git a/app/build.gradle b/app/build.gradle index 19c90a3..3348264 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.swatian.nexnotes" minSdk 27 targetSdk 34 - versionCode 11 - versionName "1.1" + versionCode 12 + versionName "1.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/swatian/nexnotes/bottomsheets/BottomSheetNotes.java b/app/src/main/java/com/swatian/nexnotes/bottomsheets/BottomSheetNotes.java index 0c3c3c0..159b78a 100644 --- a/app/src/main/java/com/swatian/nexnotes/bottomsheets/BottomSheetNotes.java +++ b/app/src/main/java/com/swatian/nexnotes/bottomsheets/BottomSheetNotes.java @@ -86,9 +86,13 @@ public View onCreateView( bottomSheetNotesBinding.closeBs.setOnClickListener(close -> dismiss()); bottomSheetNotesBinding.view.setOnClickListener( - close -> { + view -> { bottomSheetNotesBinding.contents.setVisibility(View.GONE); bottomSheetNotesBinding.renderContents.setVisibility(View.VISIBLE); + + bottomSheetNotesBinding.edit.setVisibility(View.VISIBLE); + bottomSheetNotesBinding.view.setVisibility(View.GONE); + Markdown.render( requireContext(), EmojiParser.parseToUnicode( @@ -97,9 +101,12 @@ public View onCreateView( }); bottomSheetNotesBinding.edit.setOnClickListener( - close -> { + edit -> { bottomSheetNotesBinding.contents.setVisibility(View.VISIBLE); bottomSheetNotesBinding.renderContents.setVisibility(View.GONE); + + bottomSheetNotesBinding.edit.setVisibility(View.GONE); + bottomSheetNotesBinding.view.setVisibility(View.VISIBLE); }); assert noteTopicsApi != null; @@ -142,7 +149,6 @@ public View onCreateView( bottomSheetNotesBinding.contents.addTextChangedListener(textWatcher); } else if (source.equalsIgnoreCase("new")) { - bottomSheetNotesBinding.topicsDropdownDivider.setVisibility(View.GONE); bottomSheetNotesBinding.topicsDropdownLayout.setVisibility(View.GONE); bottomSheetNotesBinding.title.addTextChangedListener(textWatcher); @@ -186,8 +192,6 @@ public void afterTextChanged(Editable s) { } else { if (title.length() > 2) { - bottomSheetNotesBinding.topicsDropdownDivider.setVisibility( - View.VISIBLE); bottomSheetNotesBinding.topicsDropdownLayout.setVisibility( View.VISIBLE); diff --git a/app/src/main/res/drawable/shape_input.xml b/app/src/main/res/drawable/shape_input.xml index 95e8924..6f3867e 100644 --- a/app/src/main/res/drawable/shape_input.xml +++ b/app/src/main/res/drawable/shape_input.xml @@ -8,14 +8,17 @@ + android:topRightRadius="@dimen/dimen16dp" + android:topLeftRadius="@dimen/dimen16dp" + android:bottomLeftRadius="@dimen/dimen16dp" + android:bottomRightRadius="@dimen/dimen4dp"> + android:top="@dimen/dimen18dp"> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_input_bottom.xml b/app/src/main/res/drawable/shape_input_bottom.xml deleted file mode 100644 index 494eb1d..0000000 --- a/app/src/main/res/drawable/shape_input_bottom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_input_no_corners.xml b/app/src/main/res/drawable/shape_input_no_corners.xml deleted file mode 100644 index a911ee1..0000000 --- a/app/src/main/res/drawable/shape_input_no_corners.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_input_top.xml b/app/src/main/res/drawable/shape_input_top.xml deleted file mode 100644 index ad25a6d..0000000 --- a/app/src/main/res/drawable/shape_input_top.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c1d4300..93e3525 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,7 +8,7 @@ - - - - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + android:paddingStart="@dimen/dimen16dp" + android:paddingEnd="@dimen/dimen16dp" + app:cornerRadius="@dimen/dimen16dp" + android:layout_gravity="center" + app:iconSize="@dimen/dimen20dp" + app:icon="@drawable/ic_view" /> - + android:layout_gravity="center" + app:iconSize="@dimen/dimen20dp" + app:icon="@drawable/ic_pencil" /> @@ -84,56 +66,45 @@ - - - - - + android:layout_weight="1" /> diff --git a/app/src/main/res/layout/bottom_sheet_topics.xml b/app/src/main/res/layout/bottom_sheet_topics.xml index a9c3d19..ef25563 100644 --- a/app/src/main/res/layout/bottom_sheet_topics.xml +++ b/app/src/main/res/layout/bottom_sheet_topics.xml @@ -24,18 +24,17 @@ android:background="?android:attr/selectableItemBackgroundBorderless" app:tint="?attr/iconsColor" /> - + android:contentDescription="@string/save" + android:text="@string/save" + style="@style/CustomMaterialButton" /> @@ -49,7 +48,7 @@ @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:layout_marginBottom="@dimen/dimen32dp" + android:layout_marginBottom="@dimen/dimen40dp" android:layout_marginEnd="@dimen/dimen16dp" android:contentDescription="@string/add" app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 71b1c66..a68e9bb 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -18,7 +18,7 @@ android:layout_marginBottom="@dimen/dimen80dp" android:orientation="vertical"> - + + android:text="@string/appearance" /> - + android:layout_marginTop="@dimen/dimen16dp" + android:layout_marginStart="@dimen/dimen16dp" + android:layout_marginEnd="@dimen/dimen16dp" + android:layout_marginBottom="@dimen/dimen32dp"> + + - - + android:orientation="horizontal"> - + android:layout_weight="1" + android:text="@string/language" + android:textSize="@dimen/dimen16sp" /> - - - - - + - - + + - + android:layout_marginTop="@dimen/dimen16dp" + android:layout_marginStart="@dimen/dimen16dp" + android:layout_marginEnd="@dimen/dimen16dp" + android:layout_marginBottom="@dimen/dimen32dp"> + + - - + android:orientation="horizontal"> - - - - - + android:layout_weight="1" + android:text="@string/settings_biometric_header" + android:textSize="@dimen/dimen16sp" /> - + - + - + + android:text="@string/notes" /> - + android:layout_marginTop="@dimen/dimen16dp" + android:layout_marginStart="@dimen/dimen16dp" + android:layout_marginEnd="@dimen/dimen16dp" + android:layout_marginBottom="@dimen/dimen32dp" + android:orientation="vertical"> + android:gravity="center_vertical" + android:orientation="horizontal"> + + + android:orientation="horizontal"> - + - + android:text="@string/zero" + android:textSize="@dimen/dimen14sp" /> - + - + - + - + - + - - + android:orientation="horizontal"> - - - - - + android:layout_weight="1" + android:text="@string/delete" + android:textSize="@dimen/dimen16sp" /> - + - - + + - + android:layout_marginTop="@dimen/dimen16dp" + android:layout_marginStart="@dimen/dimen16dp" + android:layout_marginEnd="@dimen/dimen16dp" + android:layout_marginBottom="@dimen/dimen32dp" + android:orientation="vertical"> + android:background="?android:attr/selectableItemBackground" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + android:orientation="horizontal"> - - - + + + android:text="@string/version" + android:textSize="@dimen/dimen14sp" /> - + - + - + - + - + + tools:ignore="UseCompoundDrawables"> + + - - - - - - - - + app:srcCompat="@drawable/ic_external_link" /> - + + + + + + + + tools:ignore="UseCompoundDrawables"> + + - - - - - - - - + app:srcCompat="@drawable/ic_external_link" /> - + + + + + + + + tools:ignore="UseCompoundDrawables"> + + - - - - - - - - + app:srcCompat="@drawable/ic_external_link" /> - + + + + + + + + tools:ignore="UseCompoundDrawables"> + + - - - - - - - - + app:srcCompat="@drawable/ic_external_link" /> - + + + + + + + + tools:ignore="UseCompoundDrawables"> + + - - - - - - - - + app:srcCompat="@drawable/ic_external_link" /> - + diff --git a/app/src/main/res/layout/fragment_topics.xml b/app/src/main/res/layout/fragment_topics.xml index 8e7c270..c88eda0 100644 --- a/app/src/main/res/layout/fragment_topics.xml +++ b/app/src/main/res/layout/fragment_topics.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="@dimen/dimen10dp" - android:paddingBottom="@dimen/dimen18dp" + android:paddingBottom="@dimen/dimen26dp" android:paddingStart="@dimen/dimen10dp" android:paddingEnd="@dimen/dimen10dp" /> @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:layout_marginBottom="@dimen/dimen32dp" + android:layout_marginBottom="@dimen/dimen40dp" android:layout_marginEnd="@dimen/dimen16dp" android:contentDescription="@string/add" app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" diff --git a/app/src/main/res/layout/list_notes.xml b/app/src/main/res/layout/list_notes.xml index 091f3e4..947db8a 100644 --- a/app/src/main/res/layout/list_notes.xml +++ b/app/src/main/res/layout/list_notes.xml @@ -30,7 +30,7 @@ android:id="@+id/content" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dimen4dp" + android:layout_marginTop="@dimen/dimen8dp" android:textSize="@dimen/dimen14sp" /> diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 30fa2c2..2c5c577 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -20,4 +20,18 @@ @color/divider_background_dark @color/input_color_dark + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e8a0f72..bae2257 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,8 +8,8 @@ #FF018786 #FF000000 #FFFFFFFF - #FEF7FF - #131313 - #ECE6F0 - #2E2E35 + #F1E2FD + #221C2B + #DFDDE2 + #272F38 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 22a46e9..936847a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -72,6 +72,7 @@ System Search Display + Appearance Translation Security Version @@ -82,5 +83,6 @@ Database Title (mandatory) General + Save \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index fecf960..a27cc36 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -22,4 +22,18 @@ @color/divider_background_light @color/input_color_light + + + + + + \ No newline at end of file diff --git a/metadata/en-US/changelogs/12.txt b/metadata/en-US/changelogs/12.txt new file mode 100644 index 0000000..78ff95e --- /dev/null +++ b/metadata/en-US/changelogs/12.txt @@ -0,0 +1,6 @@ +1.2 + +- UI updates +- Other fixes + +https://github.com/Swatian/nexnotes/releases \ No newline at end of file diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt index fb39716..58309f5 100644 --- a/metadata/en-US/full_description.txt +++ b/metadata/en-US/full_description.txt @@ -8,6 +8,7 @@ A simple and free native Android app for taking notes. - Localized - Search by title, content and topic - Light/dark theme (follows system) +- Markdown support - & more... Source code: https://github.com/Swatian/nexnotes diff --git a/metadata/en-US/images/phoneScreenshots/001.png b/metadata/en-US/images/phoneScreenshots/001.png index ff7925d..d0245f6 100644 Binary files a/metadata/en-US/images/phoneScreenshots/001.png and b/metadata/en-US/images/phoneScreenshots/001.png differ diff --git a/metadata/en-US/images/phoneScreenshots/002.png b/metadata/en-US/images/phoneScreenshots/002.png index 84c874f..ec28a3c 100644 Binary files a/metadata/en-US/images/phoneScreenshots/002.png and b/metadata/en-US/images/phoneScreenshots/002.png differ diff --git a/metadata/en-US/images/phoneScreenshots/003.png b/metadata/en-US/images/phoneScreenshots/003.png index 1a8dd83..623a7bc 100644 Binary files a/metadata/en-US/images/phoneScreenshots/003.png and b/metadata/en-US/images/phoneScreenshots/003.png differ diff --git a/metadata/en-US/images/phoneScreenshots/004.png b/metadata/en-US/images/phoneScreenshots/004.png index 0b01bac..d77d7cd 100644 Binary files a/metadata/en-US/images/phoneScreenshots/004.png and b/metadata/en-US/images/phoneScreenshots/004.png differ diff --git a/metadata/en-US/short_description.txt b/metadata/en-US/short_description.txt index 90bc75b..740d4a4 100644 --- a/metadata/en-US/short_description.txt +++ b/metadata/en-US/short_description.txt @@ -1 +1 @@ -Nex Notes for taking quick notes \ No newline at end of file +Taking quick notes \ No newline at end of file diff --git a/metadata/en-US/title.txt b/metadata/en-US/title.txt index 89e5fb7..fea800c 100644 --- a/metadata/en-US/title.txt +++ b/metadata/en-US/title.txt @@ -1 +1 @@ -Nex Notes for taking quick notes +Nex Notes