Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Peertube colors

This commit is contained in:
tom79 2019-11-13 15:32:33 +01:00
parent 5f3cbde13e
commit 860cc8cf81
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
View File

@ -100,9 +100,6 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
case Helper.THEME_LIGHT:
setTheme(R.style.TransparentLight);
break;
case Helper.THEME_DARK:
setTheme(R.style.TransparentDark);
break;
case Helper.THEME_BLACK:
setTheme(R.style.TransparentBlack);
break;
@ -110,7 +107,6 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
setTheme(R.style.TransparentDark);
}
setContentView(R.layout.activity_media_pager);
CoordinatorLayout swipeBackLayout = findViewById(R.id.swipeBackLayout);
fullscreen = false;
media_description = findViewById(R.id.media_description);
@ -119,7 +115,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
swipeEnabled = true;
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(SlideMediaActivity.this, R.color.cyanea_primary)));
//actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(SlideMediaActivity.this, R.color.cyanea_primary)));
LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
assert inflater != null;
View view = inflater.inflate(R.layout.media_action_bar, new LinearLayout(getApplicationContext()), false);
@ -159,7 +155,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
int position = mPager.getCurrentItem();
Attachment attachment = attachments.get(position);
if (attachment.getType().toLowerCase().equals("video") || attachment.getType().toLowerCase().equals("audio") || attachment.getType().toLowerCase().equals("gifv")) {
new HttpsConnection(getApplicationContext(), Helper.getLiveInstance(getApplicationContext())).download(attachment.getUrl(), SlideMediaActivity.this);
downloadID = Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
} else {
if (Build.VERSION.SDK_INT >= 23) {
if (ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {

2
app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java
View File

@ -95,7 +95,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements
assert context != null;
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
dialogBuilder.setMessage(R.string.restore_default_theme);
dialogBuilder.setPositiveButton(R.string.disable, new DialogInterface.OnClickListener() {
dialogBuilder.setPositiveButton(R.string.restore, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
reset();

5
app/src/main/res/layout/media_action_bar.xml
View File

@ -34,6 +34,7 @@
<ImageView
android:id="@+id/toolbar_close"
android:src="@drawable/ic_close"
android:tint="?attr/menuIconColor"
android:layout_width="30dp"
android:layout_height="30dp"
android:gravity="center_vertical"
@ -51,8 +52,8 @@
<ImageView
android:id="@+id/media_save"
android:background="@color/transparent"
android:src="@drawable/ic_save_white"
android:tint="?attr/menuIconColor"
android:scaleType="fitXY"
android:layout_width="25dp"
android:layout_height="25dp"
@ -63,8 +64,8 @@
android:contentDescription="@string/download" />
<ImageView
android:id="@+id/media_share"
android:background="@color/transparent"
android:src="@drawable/ic_share_media"
android:tint="?attr/menuIconColor"
android:scaleType="fitXY"
android:layout_width="25dp"
android:layout_height="25dp"

3
app/src/main/res/values/styles.xml
View File

@ -115,6 +115,7 @@
<style name="TransparentLight" parent="Theme.Cyanea.Light">black_icon_theme
<item name="iconColor">@color/black</item>
<item name="iconColorMenu">@color/black</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
@ -125,6 +126,7 @@
<style name="TransparentDark" parent="Theme.Cyanea.Dark">
<item name="iconColor">@color/dark_icon_theme</item>
<item name="iconColorMenu">@color/dark_icon_theme</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
@ -134,6 +136,7 @@
<style name="TransparentBlack" parent="Theme.Cyanea.Dark">
<item name="iconColor">@color/black_icon_theme</item>
<item name="iconColorMenu">@color/dark_icon_theme</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>