summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasun <k-a-s-u-n@tuta.io>2019-05-10 01:29:32 +0530
committerKasun <k-a-s-u-n@tuta.io>2019-05-10 01:29:32 +0530
commitc1a22a1320da6c8f6a2776493898b920d2216cb3 (patch)
tree3de8c09e7d4ecbe9a4ae32e5bc3300fcc780f800
parente55bf64bf0239a49d52849084a805c94feb7e97e (diff)
theming the undo bar
-rw-r--r--app/src/main/java/fr/gouv/etalab/mastodon/activities/ReorderTimelinesActivity.java5
-rw-r--r--app/src/main/res/layout/activity_reorder_tabs.xml2
2 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ReorderTimelinesActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ReorderTimelinesActivity.java
index b9d1d85ef..3b0990b84 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ReorderTimelinesActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ReorderTimelinesActivity.java
@@ -103,12 +103,13 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
private ManageTimelines timeline;
private boolean isLoadingInstance;
private String oldSearch;
+ private int theme;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
- int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+ theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
switch (theme){
case Helper.THEME_LIGHT:
setTheme(R.style.AppTheme);
@@ -371,6 +372,8 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
@Override
public void onUndo(ManageTimelines manageTimelines, int position) {
+ if (theme == THEME_LIGHT)
+ undo_container.setBackgroundColor(getResources().getColor(R.color.mastodonC3));
undo_container.setVisibility(View.VISIBLE);
switch (manageTimelines.getType()){
case TAG:
diff --git a/app/src/main/res/layout/activity_reorder_tabs.xml b/app/src/main/res/layout/activity_reorder_tabs.xml
index a3d52463f..9ba645239 100644
--- a/app/src/main/res/layout/activity_reorder_tabs.xml
+++ b/app/src/main/res/layout/activity_reorder_tabs.xml
@@ -31,7 +31,7 @@
<RelativeLayout
android:id="@+id/undo_container"
android:visibility="gone"
- android:background="@color/mastodonC3"
+ android:background="@color/notif_black_3"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_alignParentBottom="true"