diff options
| -rw-r--r-- | res/layout-xlarge/main.xml | 69 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 7 | ||||
| -rw-r--r-- | src/org/fox/ttrss/OfflineActivity.java | 2 |
3 files changed, 57 insertions, 21 deletions
diff --git a/res/layout-xlarge/main.xml b/res/layout-xlarge/main.xml index e0a8394c..a07f70d4 100644 --- a/res/layout-xlarge/main.xml +++ b/res/layout-xlarge/main.xml @@ -1,16 +1,55 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" android:id="@+id/main_flipper"> - <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:id="@+id/loading_container"> - <ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar> - <TextView android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message"></TextView> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="horizontal" > + + <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" + style="?android:attr/progressBarStyleLarge" + 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" + android:textAppearance="?android:attr/textAppearanceLarge" /> </LinearLayout> - <LinearLayout android:layout_height="fill_parent" android:orientation="horizontal" android:id="@+id/main" android:layout_width="fill_parent"> - <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.3" android:id="@+id/feeds_fragment"></FrameLayout> - <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.3" android:id="@+id/cats_fragment"></FrameLayout> - <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.5" android:id="@+id/headlines_fragment"></FrameLayout> - <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.5" android:id="@+id/article_fragment"></FrameLayout> - </LinearLayout> - - -</FrameLayout>
\ No newline at end of file + + <FrameLayout + android:id="@+id/feeds_fragment" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="0.3" > + </FrameLayout> + + <FrameLayout + android:id="@+id/cats_fragment" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="0.3" > + </FrameLayout> + + <FrameLayout + android:id="@+id/headlines_fragment" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="0.5" > + </FrameLayout> + + <FrameLayout + android:id="@+id/article_fragment" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="0.5" > + </FrameLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index f34e4977..51c40e67 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -492,10 +492,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices { Log.d(TAG, "m_compatMode=" + m_compatMode); if (!m_compatMode) { - if (findViewById(R.id.main_flipper) != null) - new TransitionHelper((ViewGroup) findViewById(R.id.main_flipper)); - else - new TransitionHelper((ViewGroup) findViewById(R.id.main)); + new TransitionHelper((ViewGroup) findViewById(R.id.main)); m_headlinesActionModeCallback = new HeadlinesActionModeCallback(); } @@ -1254,7 +1251,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices { } private void loginSuccess() { - findViewById(R.id.loading_container).setVisibility(View.INVISIBLE); + findViewById(R.id.loading_container).setVisibility(View.GONE); m_isOffline = false; diff --git a/src/org/fox/ttrss/OfflineActivity.java b/src/org/fox/ttrss/OfflineActivity.java index 3eccf474..ca69623c 100644 --- a/src/org/fox/ttrss/OfflineActivity.java +++ b/src/org/fox/ttrss/OfflineActivity.java @@ -137,7 +137,7 @@ public class OfflineActivity extends FragmentActivity implements initMainMenu(); - findViewById(R.id.loading_container).setVisibility(View.INVISIBLE); + findViewById(R.id.loading_container).setVisibility(View.GONE); if (m_smallScreenMode) { if (m_selectedArticleId != 0) { |