Revert "use dialogwhenlarge theme for image pager"
This reverts commit f114539024
.
This commit is contained in:
parent
f114539024
commit
e947eb7b8e
@ -254,7 +254,6 @@
|
||||
|
||||
<activity
|
||||
android:name=".ArticleImagesPagerActivity"
|
||||
android:theme="@style/ImagePagerTheme"
|
||||
android:label="Article Images" >
|
||||
</activity>
|
||||
|
||||
|
@ -14,6 +14,7 @@ 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;
|
||||
@ -255,14 +256,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.activity_images_pager);
|
||||
setContentView(R.layout.article_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);
|
||||
|
||||
|
4
org.fox.ttrss/src/main/res/layout/activity_images_pager.xml → org.fox.ttrss/src/main/res/layout/article_images_pager.xml
Normal file → Executable file
4
org.fox.ttrss/src/main/res/layout/activity_images_pager.xml → org.fox.ttrss/src/main/res/layout/article_images_pager.xml
Normal file → Executable file
@ -1,7 +1,9 @@
|
||||
<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
|
||||
@ -35,4 +37,6 @@
|
||||
android:visibility="invisible" />
|
||||
|
||||
|
||||
<include layout="@layout/toolbar" android:id="@+id/toolbar" />
|
||||
|
||||
</RelativeLayout>
|
@ -123,12 +123,4 @@
|
||||
<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>
|
Loading…
Reference in New Issue
Block a user