diff options
-rw-r--r-- | .classpath | 4 | ||||
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | default.properties | 2 | ||||
-rw-r--r-- | libs/android-support-v4.jar | bin | 224376 -> 247894 bytes | |||
-rw-r--r-- | libs/gson-1.7.1.jar (renamed from lib/gson-1.7.1.jar) | bin | 173590 -> 173590 bytes | |||
-rw-r--r-- | libs/jsoup-1.6.1.jar (renamed from lib/jsoup-1.6.1.jar) | bin | 281579 -> 281579 bytes | |||
-rw-r--r-- | project.properties | 2 | ||||
-rw-r--r-- | res/layout/main.xml | 19 | ||||
-rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 21 | ||||
-rw-r--r-- | src/org/fox/ttrss/OfflineActivity.java | 18 |
10 files changed, 24 insertions, 46 deletions
@@ -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"/>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 20a4d7c9..b44f7363 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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" /> diff --git a/default.properties b/default.properties index a1ad2e01..ede6e6b8 100644 --- a/default.properties +++ b/default.properties @@ -1,2 +1,2 @@ # Project target. -target=android-13 +target=android-14 diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar Binary files differindex b254ef5f..d006198e 100644 --- a/libs/android-support-v4.jar +++ b/libs/android-support-v4.jar diff --git a/lib/gson-1.7.1.jar b/libs/gson-1.7.1.jar Binary files differindex acd16c06..acd16c06 100644 --- a/lib/gson-1.7.1.jar +++ b/libs/gson-1.7.1.jar diff --git a/lib/jsoup-1.6.1.jar b/libs/jsoup-1.6.1.jar Binary files differindex 87126a49..87126a49 100644 --- a/lib/jsoup-1.6.1.jar +++ b/libs/jsoup-1.6.1.jar diff --git a/project.properties b/project.properties index b904742f..730e911f 100644 --- a/project.properties +++ b/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-13 +target=android-14 diff --git a/res/layout/main.xml b/res/layout/main.xml index a0350695..e91993fd 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -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" >
-
- <ProgressBar
- android:id="@+id/loading_progress"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ android:gravity="center"
+ android:orientation="vertical" >
<TextView
android:id="@+id/loading_message"
- android:layout_width="wrap_content"
+ 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" />
+
</LinearLayout>
<FrameLayout
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 06647e11..f34e4977 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -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(); - - Log.d(TAG, "WxH=" + width + "x" + height); - - /* if (height > width) { - int tmp = width; - width = height; - height = tmp; - } */ + m_smallScreenMode = m_compatMode || (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != + Configuration.SCREENLAYOUT_SIZE_XLARGE; - 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); diff --git a/src/org/fox/ttrss/OfflineActivity.java b/src/org/fox/ttrss/OfflineActivity.java index 16dd7064..3eccf474 100644 --- a/src/org/fox/ttrss/OfflineActivity.java +++ b/src/org/fox/ttrss/OfflineActivity.java @@ -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) { |