Skip to content

Commit

Permalink
Version 1.2.8.b3
Browse files Browse the repository at this point in the history 
- Nook EInk reintegration and advanced support
- Multicolumns auto-count algorithm reworked with configuration
- Working under Nook 1.1.0 checked

Signed-off-by: Igor Dulevich <gamba69@gmail.com>
  • Loading branch information
@gamba69
gamba69 committed Dec 15, 2011
1 parent 19cc8a1 commit 1de9455
Show file tree
Hide file tree
Showing 14 changed files with 348 additions and 69 deletions.
2 changes: 1 addition & 1 deletion AndroidManifest.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.harasoft.relaunch"
android:versionName="1.2.8b2" android:versionCode="100200802">
android:versionName="1.2.8b3" android:versionCode="100200803">
<uses-sdk android:minSdkVersion="7" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.GET_TASKS" />
Expand Down
2 changes: 1 addition & 1 deletion res/layout/advanced_layout.xml
View file
Expand Up @@ -6,7 +6,7 @@
android:layout_height="fill_parent" android:background="@color/normal_bg" android:padding="8dp">
<LinearLayout android:id="@+id/linearLayout1" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="0.55">
<TextView android:id="@+id/results_title" android:textColor="@color/normal_fg" android:background="@color/normal_bg_gray" android:textAppearance="?android:attr/textAppearanceMedium" android:inputType="textMultiLine" android:focusable="false" android:editable="false" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1" android:layout_gravity="center" android:gravity="center" android:textStyle="bold" android:text="Text View"/>
<ImageButton android:src="@android:drawable/ic_menu_revert" android:id="@+id/results_btn" android:layout_weight="4" android:layout_width="fill_parent" android:layout_gravity="center" android:layout_height="fill_parent" android:layout_marginLeft="4dp"></ImageButton>
<ImageButton android:src="@android:drawable/ic_menu_revert" android:id="@+id/results_btn" android:layout_weight="4" android:layout_width="fill_parent" android:layout_gravity="center" android:layout_height="56dp" android:layout_marginLeft="4dp"></ImageButton>
</LinearLayout>
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="0.4" android:id="@+id/wifi_lv_layout" android:layout_marginTop="8dp" android:background="@drawable/main_button" android:padding="8dp">
<ListView android:layout_width="fill_parent" android:id="@+id/wifi_lv" android:layout_weight="1" android:layout_height="fill_parent"/>
Expand Down
41 changes: 27 additions & 14 deletions res/values-ru/arrays.xml
View file
Expand Up @@ -67,15 +67,17 @@
<item>Качественный, мерц. (CLEAR_ALL mode 6)</item>
</string-array>
<string-array name="einkUpdateMode_values">
<item>-1</item>
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="einkUpdateMode_names">
<item>Не использовать</item>
<item>Качественный (GC+ONESHOT_ALL)</item>
<item>Быстрый (GU+ONESHOT_ALL)</item>
<item>Быстрый (GL16+ACTIVE_ALL)</item>
</string-array>
</string-array>
<string-array name="home_button_actions_values">
<item>NOTHING</item>
<item>OPEN1</item>
Expand All @@ -90,20 +92,31 @@
<item>Открыть меню выбора начальной папки</item>
<item>Открыть окно списка начальных папок</item>
</string-array>
<string-array name="output_columns_values">
<item >-1</item>
<item >1</item>
<item >2</item>
<item >3</item>
<item >4</item>
<item >5</item>
<string-array name="output_columns_values">
<item>-1</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
</string-array>
<string-array name="output_columns_names">
<item >Автоматическое число колонок</item>
<item >1 колонка</item>
<item >2 колонки</item>
<item >3 колонки</item>
<item >4 колонки</item>
<item >5 колонок</item>
<item>Автоматическое число колонок</item>
<item>1 колонка</item>
<item>2 колонки</item>
<item>3 колонки</item>
<item>4 колонки</item>
<item>5 колонок</item>
</string-array>
<string-array name="output_columns_intensity_values">
<item>60 5:5 9:4 19:3 64:2</item>
<item>70 3:5 7:4 15:3 48:2</item>
<item>80 2:5 5:4 11:3 32:2</item>
</string-array>
<string-array name="output_columns_intensity_names">
<item>Агрессивный (больше колонок)</item>
<item>Умереный</item>
<item>Вялый (меньше колонок)</item>
</string-array>

</resources>
2 changes: 1 addition & 1 deletion res/values-ru/strings.xml
View file
Expand Up @@ -72,7 +72,7 @@
<string name="viewer_layout_title">ПРОСМОТР</string>
<string name="reboot_layout_text">ПЕРЕЗАГРУЗКА\n\nОжидайте...</string>
<string name="poweroff_layout_text">ВЫКЛЮЧЕНО\n\nНажмите кнопку Power для включения...</string>
<string name="jv_advanced_connected">Подключено, IP:</string>
<string name="jv_advanced_connected">IP:</string>
<string name="jv_advanced_level">Сигнал:</string>
<string name="jv_advanced_notrange">Недоступно</string>
<string name="jv_advanced_not_configured">не подключено</string>
Expand Down
38 changes: 25 additions & 13 deletions res/values/arrays.xml
View file
Expand Up @@ -67,15 +67,17 @@
<item>CLEAR_ALL (mode 6)</item>
</string-array>
<string-array name="einkUpdateMode_values">
<item>-1</item>
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="einkUpdateMode_names">
<item>Disable</item>
<item>Quality (GC+ONESHOT_ALL)</item>
<item>Speed (GU+ONESHOT_ALL)</item>
<item>Speed (GL16+ACTIVE_ALL)</item>
</string-array>
</string-array>
<string-array name="home_button_actions_values">
<item>NOTHING</item>
<item>OPEN1</item>
Expand All @@ -91,20 +93,30 @@
<item>Open home directories screen</item>
</string-array>
<string-array name="output_columns_values">
<item >-1</item>
<item >1</item>
<item >2</item>
<item >3</item>
<item >4</item>
<item >5</item>
<item>-1</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
</string-array>
<string-array name="output_columns_names">
<item >Detect automatically</item>
<item >1 column</item>
<item >2 columns</item>
<item >3 columns</item>
<item >4 columns</item>
<item >5 columns</item>
<item>Detect automatically</item>
<item>1 column</item>
<item>2 columns</item>
<item>3 columns</item>
<item>4 columns</item>
<item>5 columns</item>
</string-array>
<string-array name="output_columns_intensity_values">
<item>60 5:5 9:4 19:3 64:2</item>
<item>70 3:5 7:4 15:3 48:2</item>
<item>80 2:5 5:4 11:3 32:2</item>
</string-array>
<string-array name="output_columns_intensity_names">
<item>Aggressive (more columns)</item>
<item>Moderate</item>
<item>Sluggish (less columns)</item>
</string-array>

</resources>
3 changes: 3 additions & 0 deletions res/values/changelog.xml
View file
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="whats_new">
&lt;b&gt;1.2.8b3&lt;/b&gt;&lt;br&gt;
- Support for Eink Nook display reintegrated.&lt;br&gt;
- New auto multicolumn algorithm with some configuration.&lt;br&gt;
&lt;b&gt;1.2.8b2&lt;/b&gt;&lt;br&gt;
- Multi-column output.&lt;br&gt;
- Close Fav, Lru and so on windows after start reader (configurable).&lt;br&gt;
Expand Down
15 changes: 13 additions & 2 deletions res/xml-ru/prefs.xml
View file
Expand Up @@ -115,7 +115,7 @@
-->

<ListPreference
android:defaultValue="2"
android:defaultValue="1"
android:enabled="true"
android:entries="@array/einkUpdateMode_names"
android:entryValues="@array/einkUpdateMode_values"
Expand All @@ -125,7 +125,7 @@
android:title="Режим обновления экрана EInk" />

<EditTextPreference
android:defaultValue="0"
android:defaultValue="10"
android:enabled="true"
android:key="einkUpdateInterval"
android:persistent="true"
Expand Down Expand Up @@ -203,6 +203,17 @@
android:persistent="true"
android:selectable="true"
android:title="Список результатов поиска" />

<ListPreference
android:defaultValue="70 3:5 7:4 15:3 48:2"
android:enabled="true"
android:entries="@array/output_columns_intensity_names"
android:entryValues="@array/output_columns_intensity_values"
android:key="columnsAlgIntensity"
android:persistent="true"
android:selectable="true"
android:title="Алгоритм определения числа колонок" />

</PreferenceCategory>

<PreferenceCategory android:title="Кнопки рабочего стола" >
Expand Down
15 changes: 13 additions & 2 deletions res/xml/prefs.xml
View file
Expand Up @@ -115,7 +115,7 @@
-->

<ListPreference
android:defaultValue="2"
android:defaultValue="1"
android:enabled="true"
android:entries="@array/einkUpdateMode_names"
android:entryValues="@array/einkUpdateMode_values"
Expand All @@ -125,7 +125,7 @@
android:title="EInk Screen Update Mode" />

<EditTextPreference
android:defaultValue="0"
android:defaultValue="10"
android:enabled="true"
android:key="einkUpdateInterval"
android:persistent="true"
Expand Down Expand Up @@ -203,6 +203,17 @@
android:persistent="true"
android:selectable="true"
android:title="Search results list" />

<ListPreference
android:defaultValue="70 3:5 7:4 15:3 48:2"
android:enabled="true"
android:entries="@array/output_columns_intensity_names"
android:entryValues="@array/output_columns_intensity_values"
android:key="columnsAlgIntensity"
android:persistent="true"
android:selectable="true"
android:title="Determining the number of columns" />

</PreferenceCategory>

<PreferenceCategory android:title="Main screen buttons behavior" >
Expand Down
43 changes: 42 additions & 1 deletion src/com/harasoft/relaunch/Advanced.java
View file
Expand Up @@ -71,6 +71,34 @@ public class Advanced extends Activity {
BroadcastReceiver b2;
String connectedSSID;

private void setEinkController() {
if(prefs!=null) {
Integer einkUpdateMode = 1;
try {
einkUpdateMode = Integer.parseInt(prefs.getString("einkUpdateMode", "1"));
}
catch(Exception e) {
einkUpdateMode = 1;
}
if(einkUpdateMode<-1 || einkUpdateMode>2) einkUpdateMode=1;
if(einkUpdateMode>=0) {
EinkScreen.UpdateMode=einkUpdateMode;

Integer einkUpdateInterval = 10;
try {
einkUpdateInterval = Integer.parseInt(prefs.getString("einkUpdateInterval", "10"));
}
catch(Exception e) {
einkUpdateInterval = 10;
}
if(einkUpdateInterval<0 || einkUpdateInterval>100) einkUpdateInterval = 10;
EinkScreen.UpdateModeInterval = einkUpdateInterval;

EinkScreen.PrepareController(null, false);
}
}
}

static class NetInfo {
static int unknownLevel = -5000;
String SSID;
Expand Down Expand Up @@ -524,6 +552,7 @@ public void onClick(View v) {
wifiOnOff.setEnabled(false);
}});
wifiNetworks = readScanResults(wfm);
setEinkController();
adapter.notifyDataSetChanged();
wifiScan.setEnabled(true);
}
Expand All @@ -544,6 +573,7 @@ public void onClick(View v) {
wifiOnOff.setEnabled(false);
}});
wifiNetworks.clear();
setEinkController();
adapter.notifyDataSetChanged();
wifiScan.setEnabled(false);
}
Expand All @@ -555,6 +585,7 @@ protected void onCreate(Bundle savedInstanceState) {

prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());

setEinkController();

ingnoreFs = getResources().getStringArray(R.array.filesystems_to_ignore);

Expand Down Expand Up @@ -594,6 +625,7 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
sv.total = totalItemCount;
sv.count = visibleItemCount;
sv.first = firstVisibleItem;
setEinkController();
sv.invalidate();
}
public void onScrollStateChanged(AbsListView view, int scrollState) {
Expand All @@ -602,7 +634,15 @@ public void onScrollStateChanged(AbsListView view, int scrollState) {
addSView = false;
}
}

else {
lv_wifi.setOnScrollListener(new AbsListView.OnScrollListener() {
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
setEinkController();
}
public void onScrollStateChanged(AbsListView view, int scrollState) {
}
});
}

wifiScan = (Button)findViewById(R.id.wifi_scan_btn);
wifiScan.setOnClickListener(new View.OnClickListener() {
Expand Down Expand Up @@ -780,6 +820,7 @@ protected void onStop() {
@Override
protected void onResume() {
super.onResume();
setEinkController();
app.generalOnResume(TAG, this);
}
}

0 comments on commit 1de9455

Please sign in to comment.