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

Allow more customization, Fix some bugs #461

Open
wants to merge 6 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
8 changes: 8 additions & 0 deletions folioreader/res/layout/item_styled_text.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/txtView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
android:gravity="center"
android:textSize="17sp" />
2 changes: 1 addition & 1 deletion folioreader/res/layout/progress_dialog.xml
Original file line number Diff line number Diff line change
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
54 changes: 8 additions & 46 deletions folioreader/res/layout/view_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
android:background="@android:color/transparent"
app:layout_constraintEnd_toStartOf="@+id/view_config_ib_night_mode"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/icon_sun_sel" />
app:srcCompat="@drawable/icon_sun_sel"
tools:ignore="MissingConstraints" />

<ImageButton
android:id="@+id/view_config_ib_night_mode"
Expand All @@ -23,7 +24,8 @@
android:background="@android:color/transparent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/view_config_ib_day_mode"
app:srcCompat="@drawable/icon_moon_sel" />
app:srcCompat="@drawable/icon_moon_sel"
tools:ignore="MissingConstraints" />

<View
android:id="@+id/view3"
Expand All @@ -34,61 +36,21 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_config_ib_night_mode" />

<com.folioreader.ui.view.StyleableTextView
android:id="@+id/view_config_font_andada"
android:layout_width="0dp"
<Spinner
android:id="@+id/view_config_font_spinner"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center"
android:text="@string/andada"
android:textSize="17sp"
app:layout_constraintEnd_toStartOf="@+id/view_config_font_lato"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view3" />

<com.folioreader.ui.view.StyleableTextView
android:id="@+id/view_config_font_lato"
android:layout_width="0dp"
android:layout_height="50dp"
android:gravity="center"
android:text="@string/lato"
android:textSize="17sp"
app:folio_font="@string/lato_font"
app:layout_constraintEnd_toStartOf="@+id/view_config_font_lora"
app:layout_constraintStart_toEndOf="@+id/view_config_font_andada"
app:layout_constraintTop_toBottomOf="@+id/view3" />

<com.folioreader.ui.view.StyleableTextView
android:id="@+id/view_config_font_lora"
android:layout_width="0dp"
android:layout_height="50dp"
android:gravity="center"
android:text="@string/lora"
android:textSize="17sp"
app:folio_font="@string/lora_font"
app:layout_constraintEnd_toStartOf="@+id/view_config_font_raleway"
app:layout_constraintStart_toEndOf="@+id/view_config_font_lato"
app:layout_constraintTop_toBottomOf="@+id/view3" />

<com.folioreader.ui.view.StyleableTextView
android:id="@+id/view_config_font_raleway"
android:layout_width="0dp"
android:layout_height="50dp"
android:gravity="center"
android:text="@string/raleway"
android:textSize="17sp"
app:folio_font="@string/raleway_font"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/view_config_font_lora"
app:layout_constraintTop_toBottomOf="@+id/view3" />

<View
android:id="@+id/view4"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/grey_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_config_font_lato" />
app:layout_constraintTop_toBottomOf="@+id/view_config_font_spinner" />

<ImageView
android:id="@+id/view_config_iv_label_font_small"
Expand Down
40 changes: 0 additions & 40 deletions folioreader/src/main/assets/css/Style.css
Original file line number Diff line number Diff line change
Expand Up @@ -222,46 +222,6 @@ html.nightMode .highlight_blue {background:rgba(173, 216, 255, 0.9)}
html.nightMode .highlight_pink {background:rgba(255, 176, 202, 0.9)}
html.nightMode .highlight_underline {border-bottom: 2px solid rgba(240, 40, 20, 0.6)}


/*
*
* Font classes
*
*/

@font-face {
font-family: 'andada';
src: url('file:///android_asset/fonts/andada/Andada-Regular.otf');
}

@font-face {
font-family: 'lato';
src: url('file:///android_asset/fonts/lato/Lato-Regular.ttf');
}

@font-face {
font-family: 'lora';
src: url('file:///android_asset/fonts/lora/Lora-Regular.ttf');
}

@font-face {
font-family: 'raleway';
src: url('file:///android_asset/fonts/raleway/Raleway-Regular.ttf');
}

.andada {
font-family: "andada", sans-serif;
}
.lato {
font-family: "lato", serif;
}
.lora {
font-family: "lora", serif;
}
.raleway {
font-family: "raleway", sans-serif;
}

html.textSizeOne { font-size: 13px !important; }
html.textSizeTwo { font-size: 15px !important; }
html.textSizeThree { font-size: 17px !important; }
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file modified folioreader/src/main/assets/fonts/andada/Andada-Regular.otf
100755 → 100644
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file modified folioreader/src/main/assets/fonts/lato/Lato-Regular.ttf
100755 → 100644
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file modified folioreader/src/main/assets/fonts/raleway/Raleway-Regular.ttf
100755 → 100644
Empty file.
16 changes: 0 additions & 16 deletions folioreader/src/main/assets/js/Bridge.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,22 +252,6 @@ $(function () {

},

setFontAndada: function () {
this.setFont("andada");
},

setFontLato: function () {
this.setFont("lato");
},

setFontPtSerif: function () {
this.setFont("pt-serif");
},

setFontPtSans: function () {
this.setFont("pt-sans");
},

base64encode: function (str) {
return btoa(unescape(encodeURIComponent(str)));
},
Expand Down
1 change: 1 addition & 0 deletions folioreader/src/main/java/com/folioreader/AppContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import android.database.Cursor;
import android.net.Uri;
import android.util.Log;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

Expand Down