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

Revert "use dialogwhenlarge theme for image pager"

Browse Source 
This reverts commit f114539024.
This commit is contained in:
Andrew Dolgov 2015-06-11 18:23:30 +03:00
parent f114539024
commit e947eb7b8e
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -254,7 +254,6 @@
<activity <activity
android:name=".ArticleImagesPagerActivity" android:name=".ArticleImagesPagerActivity"
android:theme="@style/ImagePagerTheme"
android:label="Article Images" > android:label="Article Images" >
</activity> </activity>

9
org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
View File

@ -14,6 +14,7 @@ import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import android.util.Log; import android.util.Log;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.GestureDetector; import android.view.GestureDetector;
@ -255,14 +256,14 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
m_prefs = PreferenceManager m_prefs = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext()); .getDefaultSharedPreferences(getApplicationContext());
//setTheme(R.style.DarkTheme); setTheme(R.style.DarkTheme);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_images_pager); setContentView(R.layout.article_images_pager);
//Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
//setSupportActionBar(toolbar); setSupportActionBar(toolbar);
m_progress = (ProgressBar) findViewById(R.id.article_images_progress); 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
View File

@ -1,7 +1,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:fitsSystemWindows="true"
android:id="@+id/article_images" android:id="@+id/article_images"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:background="?headlinesBackground"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<org.fox.ttrss.ArticleImagesPager <org.fox.ttrss.ArticleImagesPager
@ -35,4 +37,6 @@
android:visibility="invisible" /> android:visibility="invisible" />
<include layout="@layout/toolbar" android:id="@+id/toolbar" />
</RelativeLayout> </RelativeLayout>

8
org.fox.ttrss/src/main/res/values/style.xml
View File

@ -123,12 +123,4 @@
<item name="floatingActionButtonColor">?colorPrimaryDark</item> <item name="floatingActionButtonColor">?colorPrimaryDark</item>
</style> </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> </resources>