diff options
author | Andrew Dolgov <[email protected]> | 2015-06-11 14:15:32 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-11 14:15:32 +0300 |
commit | f114539024d0769edb6c25d0268fef6cd558c845 (patch) | |
tree | 26afcf5191fa363f14c89067cf0dcb978309b216 /org.fox.ttrss/src | |
parent | 35f421e896cc53565cc11748a624cd828a4e1fe3 (diff) |
use dialogwhenlarge theme for image pager
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 1 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java | 9 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/activity_images_pager.xml (renamed from org.fox.ttrss/src/main/res/layout/article_images_pager.xml) | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 8 |
4 files changed, 13 insertions, 9 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 2f5131c8..bf948df3 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -254,6 +254,7 @@ <activity android:name=".ArticleImagesPagerActivity" + android:theme="@style/ImagePagerTheme" android:label="Article Images" > </activity> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java index 0f7059ad..1981a727 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java @@ -14,7 +14,6 @@ import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewPager; import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.ContextMenu; import android.view.GestureDetector; @@ -256,14 +255,14 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur m_prefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); - setTheme(R.style.DarkTheme); + //setTheme(R.style.DarkTheme); super.onCreate(savedInstanceState); - setContentView(R.layout.article_images_pager); + setContentView(R.layout.activity_images_pager); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + //Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + //setSupportActionBar(toolbar); m_progress = (ProgressBar) findViewById(R.id.article_images_progress); diff --git a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/activity_images_pager.xml index 8744af67..8e754bf7 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_images_pager.xml @@ -1,9 +1,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:fitsSystemWindows="true" android:id="@+id/article_images" android:layout_width="fill_parent" android:animateLayoutChanges="true" - android:background="?headlinesBackground" android:layout_height="fill_parent"> <org.fox.ttrss.ArticleImagesPager @@ -37,6 +35,4 @@ android:visibility="invisible" /> - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> - </RelativeLayout> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index a02ee887..25084641 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -123,4 +123,12 @@ <item name="floatingActionButtonColor">?colorPrimaryDark</item> </style> + <style name="ImagePagerTheme" parent="Theme.AppCompat.DialogWhenLarge"> + <item name="windowActionBarOverlay">true</item> + + <item name="colorPrimary">#607D8B</item> + <item name="colorPrimaryDark">#455A64</item> + <item name="colorAccent">#D84315</item> + </style> + </resources>
\ No newline at end of file |