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 features 1.4 #416

Open
wants to merge 9 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
4 changes: 3 additions & 1 deletion folioreader/build.gradle
Expand Up @@ -83,9 +83,11 @@ dependencies {
implementation "androidx.appcompat:appcompat:$versions.appcompat"
implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
implementation "androidx.recyclerview:recyclerview:$versions.recyclerview"
implementation "com.google.android.material:material:$versions.material"
implementation 'com.android.support:design:28.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'


implementation 'org.slf4j:slf4j-android:1.7.25'
implementation 'com.daimajia.swipelayout:library:1.2.0@aar'

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.
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_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.
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.
Binary file modified folioreader/res/drawable-xhdpi/edit_note.png
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 modified folioreader/res/drawable-xhdpi/trash.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/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>
157 changes: 119 additions & 38 deletions folioreader/res/layout/dialog_edit_notes.xml
@@ -1,49 +1,130 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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="290dp"
android:layout_height="250dp"
android:gravity="center"
android:background="@android:color/transparent"
android:gravity="center"
android:orientation="vertical">


<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" />


<RelativeLayout
android:layout_width="290dp"
android:layout_height="250dp"
android:padding="10dp"
android:background="@color/white">

<TextView
android:id="@+id/lbl_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="@string/edit_notes"
android:textSize="23sp" />

<EditText
android:id="@+id/edit_note"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lines="5"
android:gravity="start"
android:layout_below="@id/lbl_heading"
android:inputType="textMultiLine"
android:scrollbars="vertical"
android:layout_marginTop="16dp"
android:background="@drawable/note_edittext_background"
android:padding="10dp"
android:textColor="@android:color/black" />

<Button
android:id="@+id/btn_save_note"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/edit_note"
android:layout_marginTop="8dp"
android:text="@string/save_note"
android:textColor="@android:color/white"
android:background="@color/default_theme_accent_color"
android:textAllCaps="false"
android:textSize="16sp" />
android:layout_height="match_parent"
android:layout_margin="5dp"
android:orientation="vertical">


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

<ImageButton
android:id="@+id/btn_edit_note_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_edit_note_orange"
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_edit_note_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_edit_note_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/edit_note"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:background="@drawable/note_edittext_background"
android:gravity="start"
android:inputType="textMultiLine"
android:lines="5"
android:padding="10dp"
android:scrollbars="vertical"
android:textColor="@android:color/black" />

<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/btn_delete_note"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:backgroundTint="#ffffff"
android:text="Delete"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
android:textColor="#888"
android:theme="@style/DialogCustomTheme"
app:rippleColor="@color/note_blue_blur"

/>

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_save_note"
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"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
android:theme="@style/DialogCustomTheme" />
</LinearLayout>
</LinearLayout>

</RelativeLayout>
</RelativeLayout>
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>