Skip to content

Commit 6708ea4

Browse files
plotnplotn
committed
Metro settings
1 parent e6f64dd commit 6708ea4

24 files changed

+217
-110
lines changed

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
maven { url "https://jitpack.io" }
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.0-beta03'
11+
classpath 'com.android.tools.build:gradle:3.6.0-rc01'
1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
1414
}

‎android/res/drawable/button_bg_dashed_border.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item>
4+
<shape android:shape="rectangle">
5+
<stroke
6+
android:color="?attr/colorIcon"
7+
android:width="2dp"
8+
android:dashGap="2dp"
9+
android:dashWidth="2dp"
10+
/>
11+
</shape>
12+
</item>
13+
</selector>

‎android/res/layout/book_info_dialog.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
android:ellipsize="end"
159159
android:textColor="?attr/colorIcon"
160160
android:contentDescription="@string/book_mark_toread"
161+
android:background="@drawable/button_bg_dashed_border"
161162
android:text="@string/book_mark_toread" />
162163
</LinearLayout>
163164

‎android/res/layout/geo_sett_item.xml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/row_metro"
4+
android:layout_margin="2dip"
5+
android:layout_width="fill_parent"
6+
android:layout_height="wrap_content"
7+
android:layout_weight="1"
8+
>
9+
<LinearLayout
10+
android:id="@+id/left_sett_ll"
11+
android:layout_width="0dip"
12+
android:layout_height="fill_parent"
13+
android:gravity="center_vertical|center_horizontal"
14+
android:layout_weight="2"
15+
android:orientation="vertical">
16+
<Button
17+
android:id="@+id/btn_geo_sett"
18+
style="@style/TextAppearance.Small"
19+
android:singleLine="false"
20+
android:maxLines="15"
21+
android:layout_marginRight="5dip"
22+
android:layout_width="fill_parent"
23+
android:layout_height="wrap_content"
24+
android:textColor="?attr/colorIcon"
25+
android:text="sett"
26+
/>
27+
</LinearLayout>
28+
<LinearLayout
29+
android:id="@+id/center_sett_ll"
30+
android:layout_width="0dip"
31+
android:layout_height="fill_parent"
32+
android:gravity="center_vertical|center_horizontal"
33+
android:layout_weight="5"
34+
android:orientation="horizontal">
35+
<Button
36+
android:id="@+id/btn_geo_off"
37+
style="@style/TextAppearance.Small"
38+
android:singleLine="false"
39+
android:maxLines="15"
40+
android:layout_marginRight="5dip"
41+
android:layout_width="fill_parent"
42+
android:layout_height="wrap_content"
43+
android:textColor="?attr/colorIcon"
44+
android:text="off"
45+
/>
46+
</LinearLayout>
47+
<LinearLayout
48+
android:id="@+id/right_stop_ll"
49+
android:layout_width="0dip"
50+
android:layout_height="fill_parent"
51+
android:gravity="center_vertical|center_horizontal"
52+
android:layout_weight="2"
53+
android:orientation="horizontal">
54+
<Button
55+
android:id="@+id/btn_geo_mode"
56+
style="@style/TextAppearance.Small"
57+
android:singleLine="false"
58+
android:maxLines="15"
59+
android:layout_marginRight="5dip"
60+
android:layout_width="fill_parent"
61+
android:layout_height="wrap_content"
62+
android:textColor="?attr/colorIcon"
63+
android:text="metro"
64+
/>
65+
</LinearLayout>
66+
</TableRow>

‎android/res/values-ru/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@
228228
<string name="book_info_action_opds_info_final">Книга скачана из OPDS каталога:</string>
229229
<string name="book_info_action_open">Открыть книгу</string>
230230
<string name="book_info_action_download">Скачать книгу</string>
231+
<string name="book_info_action_downloading">Книга скачивается...</string>
232+
<string name="book_info_action_download1">Нажмите на обложку, чтобы скачать книгу</string>
233+
<string name="book_info_action_download2">Нажмите на обложку, чтобы открыть книгу</string>
231234
<string name="book_info_action_unavailable">Сначала вы должны скачать книгу</string>
232235
<string name="mi_book_styles_enable">Разрешить встроенные стили документа</string>
233236
<string name="mi_book_styles_disable">Запретить встроенные стили документа</string>

‎android/res/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@
240240
<string name="book_info_action_opds_info_final">Book has been downloaded from OPDS:</string>
241241
<string name="book_info_action_open">Open book</string>
242242
<string name="book_info_action_download">Download book</string>
243+
<string name="book_info_action_download1">Click cover to download the book</string>
244+
<string name="book_info_action_download2">Click cover to open the book</string>
245+
<string name="book_info_action_downloading">Book is downloading...</string>
243246
<string name="book_info_action_unavailable">First you should download the book</string>
244247
<string name="mi_book_styles_enable">Enable document internal styles</string>
245248
<string name="mi_book_styles_disable">Disable document internal styles</string>

‎android/src/org/coolreader/CoolReader.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,6 @@
133133
import com.google.gson.Gson;
134134
import com.google.gson.GsonBuilder;
135135

136-
//import javax.imageio.*;
137-
138-
//import net.htmlparser.jericho.HTMLElementName;
139-
//import net.htmlparser.jericho.Source;
140-
//import net.htmlparser.jericho.TextExtractor;
141-
142136
import okhttp3.Call;
143137
import okhttp3.HttpUrl;
144138
import okhttp3.OkHttpClient;

‎android/src/org/coolreader/cloud/CloudSyncFolder.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.coolreader.cloud;
22

3-
import android.content.Intent;
4-
import android.net.Uri;
53
import android.util.Log;
64

75
import com.google.gson.Gson;
@@ -22,12 +20,10 @@
2220
import java.io.FileInputStream;
2321
import java.io.FileOutputStream;
2422
import java.io.FilenameFilter;
25-
import java.io.InputStream;
2623
import java.io.OutputStream;
2724
import java.util.ArrayList;
2825
import java.util.Collections;
2926
import java.util.Comparator;
30-
import java.util.Date;
3127
import java.util.zip.CRC32;
3228

3329
public class CloudSyncFolder {

‎android/src/org/coolreader/cloud/OpenBookFromCloudDlg.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,13 @@
1919
import android.widget.RadioGroup;
2020
import android.widget.TextView;
2121

22-
import com.dropbox.core.v2.files.FileMetadata;
23-
import com.dropbox.core.v2.files.Metadata;
24-
2522
import org.coolreader.CoolReader;
2623
import org.coolreader.R;
2724
import org.coolreader.cloud.yandex.YNDListFiles;
2825
import org.coolreader.crengine.BaseDialog;
2926
import org.coolreader.crengine.BaseListView;
3027
import org.coolreader.crengine.StrUtils;
3128

32-
import java.sql.Struct;
3329
import java.util.ArrayList;
3430
import java.util.Date;
3531
import java.util.List;

‎android/src/org/coolreader/cloud/dropbox/DBXConfig.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
package org.coolreader.cloud.dropbox;
22

3-
import android.content.ActivityNotFoundException;
4-
import android.content.Intent;
5-
import android.net.Uri;
6-
73
import com.dropbox.core.DbxAppInfo;
8-
import com.dropbox.core.DbxAuthFinish;
94
import com.dropbox.core.DbxException;
105
import com.dropbox.core.DbxRequestConfig;
116
import com.dropbox.core.DbxSessionStore;
127
import com.dropbox.core.DbxWebAuth;
13-
import com.dropbox.core.http.OkHttp3Requestor;
148
import com.dropbox.core.v2.DbxClientV2;
15-
import com.dropbox.core.DbxHost;
169

1710
import org.coolreader.CoolReader;
1811
import org.coolreader.R;
@@ -21,11 +14,10 @@
2114
import java.io.File;
2215
import java.io.FileReader;
2316
import java.io.IOException;
24-
import java.io.InputStreamReader;
2517

2618
public class DBXConfig {
27-
public static final String DBX_KEY = "put_yours";
28-
public static final String DBX_SECRET = "put_yours";
19+
public static final String DBX_KEY = "r8s8q13icp2fynx"; //"put_yours";
20+
public static final String DBX_SECRET = "ascdad2ohiix1em"; //"put_yours";
2921
public static final String DBX_REDIRECT_URL = "https://github.com/plotn/coolreader";
3022
public static DbxRequestConfig mDbxRequestConfig = null;
3123
public static DbxClientV2 mDbxClient = null;

0 commit comments

Comments
 (0)