Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remake ui #415

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions folioreader/build.gradle
Expand Up @@ -84,6 +84,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
implementation "androidx.recyclerview:recyclerview:$versions.recyclerview"
implementation "com.google.android.material:material:$versions.material"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'

implementation 'org.slf4j:slf4j-android:1.7.25'
Expand Down
Binary file added folioreader/res/drawable-hdpi/ic_action_define.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added folioreader/res/drawable-hdpi/ic_action_share.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added folioreader/res/drawable-mdpi/ic_action_35972.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added folioreader/res/drawable-mdpi/ic_action_define.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added folioreader/res/drawable-mdpi/ic_action_share.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added folioreader/res/drawable-xhdpi/define_image.9.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added folioreader/res/drawable-xhdpi/ic_action_share.png
Binary file modified folioreader/res/drawable-xhdpi/icon_moon_sel.png
Binary file modified folioreader/res/drawable-xhdpi/icon_sun_sel.png
Binary file added folioreader/res/drawable-xhdpi/shadow_replace.9.png
Binary file added folioreader/res/drawable-xxhdpi/ic_action_share.png
2 changes: 1 addition & 1 deletion folioreader/res/drawable/ic_close_green_24dp.xml
Expand Up @@ -5,6 +5,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#71C851"
android:fillColor="#03a9f4"
android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
</vector>
2 changes: 1 addition & 1 deletion folioreader/res/drawable/ic_drawer.xml
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#71C951"
android:fillColor="#03a9f4"
android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />
</vector>
2 changes: 1 addition & 1 deletion folioreader/res/drawable/ic_search.xml
Expand Up @@ -5,6 +5,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF71C951"
android:fillColor="#03a9f4"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
</vector>
2 changes: 1 addition & 1 deletion folioreader/res/drawable/icon_font.xml
Expand Up @@ -4,6 +4,6 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#71C951"
android:fillColor="#03a9f4"
android:pathData="M17,8H20V20H21V21H17V20H18V17H14L12.5,20H14V21H10V20H11L17,8M18,9L14.5,16H18V9M5,3H10C11.11,3 12,3.89 12,5V16H9V11H6V16H3V5C3,3.89 3.89,3 5,3M6,5V9H9V5H6Z" />
</vector>
4 changes: 2 additions & 2 deletions folioreader/res/drawable/man_speech_icon.xml
Expand Up @@ -4,9 +4,9 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF71C951"
android:fillColor="#03a9f4"
android:pathData="M9,9m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
<path
android:fillColor="#FF71C951"
android:fillColor="#03a9f4"
android:pathData="M9,15c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4zM16.76,5.36l-1.68,1.69c0.84,1.18 0.84,2.71 0,3.89l1.68,1.69c2.02,-2.02 2.02,-5.07 0,-7.27zM20.07,2l-1.63,1.63c2.77,3.02 2.77,7.56 0,10.74L20.07,16c3.9,-3.89 3.91,-9.95 0,-14z" />
</vector>
2 changes: 1 addition & 1 deletion folioreader/res/drawable/shape_highlight_blue.xml
Expand Up @@ -6,6 +6,6 @@
android:width="48dp"
android:height="48dp" />

<solid android:color="@color/highlight_blue" />
<solid android:color="@color/note_blue" />

</shape>
2 changes: 1 addition & 1 deletion folioreader/res/drawable/shape_highlight_green.xml
Expand Up @@ -6,6 +6,6 @@
android:width="48dp"
android:height="48dp" />

<solid android:color="@color/highlight_green" />
<solid android:color="@color/note_green" />

</shape>
Expand Up @@ -6,6 +6,6 @@
android:width="48dp"
android:height="48dp" />

<solid android:color="@color/highlight_yellow" />
<solid android:color="@color/note_orange" />

</shape>
2 changes: 1 addition & 1 deletion folioreader/res/drawable/shape_highlight_pink.xml
Expand Up @@ -6,6 +6,6 @@
android:width="48dp"
android:height="48dp" />

<solid android:color="@color/highlight_pink" />
<solid android:color="@color/note_red" />

</shape>
124 changes: 124 additions & 0 deletions folioreader/res/layout/fragment_highlight_note.xml
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="220dp"
android:layout_gravity="bottom"
android:layout_margin="10dp"
tools:context=".ui.activity.FolioActivity">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@drawable/shadow_replace" />

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:scaleType="fitXY"
android:src="@drawable/define_image" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:orientation="vertical">


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<ImageButton
android:id="@+id/btn_highlight_frm_red"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_action_fiber_manual_red" />

<ImageButton
android:id="@+id/btn_highlight_frm_yellow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_action_fiber_manual_yellow" />

<ImageButton
android:id="@+id/btn_highlight_frm_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_action_fiber_manual_blue" />

<ImageButton
android:id="@+id/btn_highlight_frm_green"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_action_fiber_manual_green" />


</LinearLayout>


<EditText
android:id="@+id/edittext_highlight_frm"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_gravity="start"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:background="@null"
android:gravity="start"
android:hint="Input your note here!"
android:lines="@android:integer/config_longAnimTime"
android:text=""
android:textAlignment="viewStart"
android:textSize="15sp" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:orientation="horizontal">

<com.google.android.material.button.MaterialButton
android:id="@+id/note_delete_btn"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:layout_weight="1"
android:backgroundTint="#ffffff"
android:text="Delete"
android:textColor="#888"
app:rippleColor="@color/note_blue_blur"

/>

<com.google.android.material.button.MaterialButton
android:id="@+id/note_save_btn"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:backgroundTint="@color/note_blue"
android:text="Save" />
</LinearLayout>

</LinearLayout>

</FrameLayout>
80 changes: 80 additions & 0 deletions folioreader/res/layout/fragment_verify_delete_note_frm.xml
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp">

<!-- TODO: Update blank fragment layout -->
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:scaleType="fitXY"
android:src="@drawable/shadow_replace" />

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="10dp"
android:scaleType="fitXY"
android:src="@drawable/define_image" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="10dp"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:text="Do you want to delete this note?"
android:textAlignment="center" />

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center">

<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.TextButton"
android:id="@+id/no_verify_delete_btn"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginLeft="30dp"
android:background="@null"
android:text="NO"
android:textColor="@color/standard_gray"
app:rippleColor="@color/standard_gray_blur"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@id/verify_delete_btn" />

<com.google.android.material.button.MaterialButton
android:id="@+id/verify_delete_btn"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity=""
android:layout_marginRight="30dp"
android:text="YES"
android:textColor="@color/note_blue"
app:rippleColor="@color/note_blue_blur"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"

/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</FrameLayout>
2 changes: 1 addition & 1 deletion folioreader/res/layout/progress_dialog.xml
Expand Up @@ -14,7 +14,7 @@
android:id="@+id/loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/android:progressBarStyle" />
style="?android:attr/progressBarStyle" />

<TextView
android:id="@+id/label_loading"
Expand Down