iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move libraries to libs/

Browse Source 
properly detect xlarge screens
update ACP library
link against API 14 (ICS)
various fixes for ICS
bump version
This commit is contained in:
Andrew Dolgov 2012-01-17 18:43:11 +03:00
parent ca5f7ed95b
commit 56d0be3e0a
10 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -3,8 +3,8 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="lib/gson-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.6.1.jar"/>
<classpathentry kind="lib" path="C:/Users/fox/workspace/org.fox.ttrss/libs/gson-1.7.1.jar"/>
<classpathentry kind="lib" path="C:/Users/fox/workspace/org.fox.ttrss/libs/jsoup-1.6.1.jar"/>
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry kind="lib" path="C:/Users/fox/android-sdk-windows/extras/google/admob_ads_sdk/GoogleAdMobAdsSdk-4.3.1.jar"/>
<classpathentry kind="output" path="bin/classes"/>

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
android:versionCode="49"
android:versionName="0.4.0" >
android:versionCode="50"
android:versionName="0.4.2" >
<uses-sdk android:minSdkVersion="7" />

2
default.properties
View File

@ -1,2 +1,2 @@
# Project target.
target=android-13
target=android-14

BIN
libs/android-support-v4.jar
View File

Binary file not shown.

0
lib/gson-1.7.1.jar → libs/gson-1.7.1.jar
View File

0
lib/jsoup-1.6.1.jar → libs/jsoup-1.6.1.jar
View File

2
project.properties
View File

@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-13
target=android-14

19
res/layout/main.xml
View File

@ -2,23 +2,26 @@
android:id="@+id/main"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
<LinearLayout
android:id="@+id/loading_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center" >
android:gravity="center"
android:orientation="vertical" >
<TextView
android:id="@+id/loading_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/loading_message" />
<ProgressBar
android:id="@+id/loading_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/loading_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_message" />
</LinearLayout>
<FrameLayout

21
src/org/fox/ttrss/MainActivity.java
View File

@ -21,6 +21,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.res.Configuration;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.ConnectivityManager;
@ -470,21 +471,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
m_enableCats = m_prefs.getBoolean("enable_cats", false);
Display display = getWindowManager().getDefaultDisplay();
int width = display.getWidth();
int height = display.getHeight();
m_smallScreenMode = m_compatMode || (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) !=
Configuration.SCREENLAYOUT_SIZE_XLARGE;
Log.d(TAG, "WxH=" + width + "x" + height);
/* if (height > width) {
int tmp = width;
width = height;
height = tmp;
} */
m_smallScreenMode = m_compatMode || (width < 960 || height < 720);
setContentView(R.layout.main);
IntentFilter filter = new IntentFilter();
@ -1266,8 +1255,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
private void loginSuccess() {
findViewById(R.id.loading_container).setVisibility(View.INVISIBLE);
findViewById(R.id.main).setVisibility(View.VISIBLE);
m_isOffline = false;
initMainMenu();
@ -1538,7 +1526,6 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
m_sessionId = null;
findViewById(R.id.loading_container).setVisibility(View.VISIBLE);
findViewById(R.id.main).setVisibility(View.INVISIBLE);
TextView tv = (TextView) findViewById(R.id.loading_message);

18
src/org/fox/ttrss/OfflineActivity.java
View File

@ -9,6 +9,7 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteStatement;
@ -120,20 +121,8 @@ public class OfflineActivity extends FragmentActivity implements
m_enableCats = m_prefs.getBoolean("enable_cats", false);
Display display = getWindowManager().getDefaultDisplay();
int width = display.getWidth();
int height = display.getHeight();
Log.d(TAG, "WxH=" + width + "x" + height);
/* if (height > width) {
int tmp = width;
width = height;
height = tmp;
} */
m_smallScreenMode = m_compatMode || (width < 960 || height < 720);
m_smallScreenMode = m_compatMode || (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) !=
Configuration.SCREENLAYOUT_SIZE_XLARGE;
setContentView(R.layout.main);
@ -149,7 +138,6 @@ public class OfflineActivity extends FragmentActivity implements
initMainMenu();
findViewById(R.id.loading_container).setVisibility(View.INVISIBLE);
findViewById(R.id.main).setVisibility(View.VISIBLE);
if (m_smallScreenMode) {
if (m_selectedArticleId != 0) {