Skip to content

Dev #103

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.

Sign up for GitHub

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

Merged
mahavir155 merged 4 commits into from
May 16, 2018
Merged

Dev #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e56f8ae
Created custom class for toolbar
GautamChibde May 15, 2018
5077170
convert bottom sheet dialog to kotlin
GautamChibde May 15, 2018
c021c45
Constraint layout for view_config
GautamChibde May 15, 2018
fc3d73c
Merge pull request #101 from codetoart/code_refactor
May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions folioreader/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ dependencies {
implementation project(':webViewMarker')

//noinspection GradleDependency
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
implementation "com.android.support:appcompat-v7:$ANDROID_LIB_VERSION"
implementation "com.android.support:recyclerview-v7:$ANDROID_LIB_VERSION"
implementation "com.android.support:support-v4:$ANDROID_LIB_VERSION"
Expand Down
Binary file added folioreader/res/drawable-hdpi/ic_format_font_black_24dp.png
View file
Open in desktop
Loading
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_format_font_black_36dp.png
View file
Open in desktop
Loading
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_format_font_black_24dp.png
View file
Open in desktop
Loading
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_format_font_black_36dp.png
View file
Open in desktop
Loading
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_format_font_black_24dp.png
View file
Open in desktop
Loading
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_format_font_black_36dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed folioreader/res/drawable-xhdpi/icon_font_big.png
View file
Open in desktop
Binary file not shown.
Binary file removed folioreader/res/drawable-xhdpi/icon_font_small.png
View file
Open in desktop
Binary file not shown.
Binary file added folioreader/res/drawable-xxhdpi/ic_format_font_black_24dp.png
View file
Open in desktop
Loading
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-xxhdpi/ic_format_font_black_36dp.png
View file
Open in desktop
Loading
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-xxxhdpi/ic_format_font_black_24dp.png
View file
Open in desktop
Loading
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-xxxhdpi/ic_format_font_black_36dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 2 additions & 86 deletions folioreader/res/layout/folio_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,94 +12,10 @@
android:layout_height="match_parent"
app:direction="vertical" />

<android.support.v7.widget.Toolbar
<com.folioreader.view.FolioToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_margin="0dp"
android:alpha="0.8"
android:background="@color/white"
android:contentInsetEnd="0dp"
android:contentInsetLeft="0dp"
android:contentInsetRight="0dp"
android:contentInsetStart="0dp"
android:padding="0dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:contentInsetEnd="0dp"
app:contentInsetLeft="0dp"
app:contentInsetRight="0dp"
app:contentInsetStart="0dp">

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

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

<ImageView
android:id="@+id/btn_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:src="@drawable/ic_close_green_24dp" />

<ImageView
android:id="@+id/btn_drawer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:src="@drawable/ic_drawer_green_24dp" />
</LinearLayout>

<TextView
android:id="@+id/lbl_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginEnd="96dp"
android:layout_marginStart="96dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="Folio Reader"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />

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

<ImageView
android:id="@+id/btn_config"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_font" />

<ImageView
android:id="@+id/btn_speaker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:src="@drawable/man_speech_icon" />
</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_alignParentBottom="true"
android:background="@android:color/black" />
</RelativeLayout>
</android.support.v7.widget.Toolbar>
android:layout_height="?android:attr/actionBarSize" />

<com.folioreader.view.MediaControllerView
android:id="@+id/media_controller_view"
Expand Down
73 changes: 73 additions & 0 deletions folioreader/res/layout/folio_toolbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tool="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:id="@+id/toolbar_container"
android:layout_height="?android:attr/actionBarSize">

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

<ImageView
android:id="@+id/btn_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:src="@drawable/ic_close_green_24dp" />

<ImageView
android:id="@+id/btn_drawer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:src="@drawable/ic_drawer_green_24dp" />
</LinearLayout>

<TextView
android:id="@+id/label_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginEnd="96dp"
android:layout_marginStart="96dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold"
tool:text="Folio Reader" />

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

<ImageView
android:id="@+id/btn_config"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_font" />

<ImageView
android:id="@+id/btn_speaker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:src="@drawable/man_speech_icon" />
</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_alignParentBottom="true"
android:background="@android:color/black" />
</RelativeLayout>
Loading