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

Merge branch 'working' into 'develop' 

Fixes

See merge request tom79/fedilab!499
This commit is contained in:
Thomas 2019-08-01 17:14:45 +02:00
parent 1c75676b8a fc77dac02f
commit 1c31f80db7
4 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -1402,13 +1402,13 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
});
if (theme == Helper.THEME_BLACK) {
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_button_black));
} else if (theme == Helper.THEME_DARK) {
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));

35
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -288,6 +288,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_display_content_after_fetch_more_text = rootView.findViewById(R.id.set_display_content_after_fetch_more_text);
set_display_content_after_fetch_more_text.setOnClickListener(v -> set_display_content_after_fetch_more.performClick());
count1 = 0;
count2 = 0;
@ -428,6 +430,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_security_provider_text = rootView.findViewById(R.id.set_security_provider_text);
set_security_provider_text.setOnClickListener(v -> set_security_provider.performClick());
boolean display_card = sharedpreferences.getBoolean(Helper.SET_DISPLAY_CARD, false);
@ -506,7 +510,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_display_video_preview_text = rootView.findViewById(R.id.set_display_video_preview_text);
set_display_video_preview_text.setOnClickListener(v -> set_display_video_preview.performClick());
boolean notif_validation = sharedpreferences.getBoolean(Helper.SET_NOTIF_VALIDATION, true);
final CheckBox set_share_validation = rootView.findViewById(R.id.set_share_validation);
@ -646,6 +651,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_remember_position_text = rootView.findViewById(R.id.set_remember_position_text);
set_remember_position_text.setOnClickListener(v -> set_remember_position.performClick());
@ -681,6 +688,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_blur_sensitive_text = rootView.findViewById(R.id.set_blur_sensitive_text);
set_blur_sensitive_text.setOnClickListener(v -> set_blur_sensitive.performClick());
boolean long_press_media = sharedpreferences.getBoolean(Helper.SET_LONG_PRESS_MEDIA, true);
final CheckBox set_long_press_media = rootView.findViewById(R.id.set_long_press_media);
@ -694,6 +703,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_long_press_media_text = rootView.findViewById(R.id.set_long_press_media_text);
set_long_press_media_text.setOnClickListener(v -> set_long_press_media.performClick());
boolean display_timeline_in_list = sharedpreferences.getBoolean(Helper.SET_DISPLAY_TIMELINE_IN_LIST, false);
@ -717,6 +728,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
LocalBroadcastManager.getInstance(context).sendBroadcast(intentBC);
}
});
final LinearLayout set_display_timeline_in_list_text = rootView.findViewById(R.id.set_display_timeline_in_list_text);
set_display_timeline_in_list_text.setOnClickListener(v -> set_display_timeline_in_list.performClick());
boolean display_news = sharedpreferences.getBoolean(Helper.SET_DISPLAY_NEWS_FROM_FEDILAB, true);
@ -740,6 +753,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
LocalBroadcastManager.getInstance(context).sendBroadcast(intentBC);
}
});
final LinearLayout set_display_news_text = rootView.findViewById(R.id.set_display_news_text);
set_display_news_text.setOnClickListener(v -> set_display_news.performClick());
boolean send_crash_reports = sharedpreferences.getBoolean(Helper.SET_SEND_CRASH_REPORTS, false);
@ -756,6 +771,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
getActivity().recreate();
}
});
final LinearLayout set_enable_crash_report_text = rootView.findViewById(R.id.set_enable_crash_report_text);
set_enable_crash_report_text.setOnClickListener(v -> set_enable_crash_report.performClick());
int truncate_toots_size = sharedpreferences.getInt(Helper.SET_TRUNCATE_TOOTS_SIZE, 0);
SeekBar set_truncate_size = rootView.findViewById(R.id.set_truncate_size);
@ -804,6 +821,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_display_fedilab_features_button_text = rootView.findViewById(R.id.set_display_fedilab_features_button_text);
set_display_fedilab_features_button_text.setOnClickListener(v -> set_fedilab_features_button.performClick());
boolean bot_icon = sharedpreferences.getBoolean(Helper.SET_DISPLAY_BOT_ICON, true);
final CheckBox set_bot_icon = rootView.findViewById(R.id.set_display_bot_icon);
@ -843,6 +862,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_quick_reply_text = rootView.findViewById(R.id.set_quick_reply_text);
set_quick_reply_text.setOnClickListener(v -> set_quick_reply.performClick());
boolean fit_preview = sharedpreferences.getBoolean(Helper.SET_FULL_PREVIEW, false);
final CheckBox set_fit_preview = rootView.findViewById(R.id.set_fit_preview);
@ -856,6 +877,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_fit_preview_text = rootView.findViewById(R.id.set_fit_preview_text);
set_fit_preview_text.setOnClickListener(v -> set_fit_preview.performClick());
boolean compact_mode = sharedpreferences.getBoolean(Helper.SET_COMPACT_MODE, false);
boolean console_mode = sharedpreferences.getBoolean(Helper.SET_CONSOLE_MODE, false);
@ -941,6 +964,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
edit_custom_sharing_url.setVisibility(View.GONE);
}
});
final LinearLayout set_custom_sharing_text = rootView.findViewById(R.id.set_custom_sharing_text);
set_custom_sharing_text.setOnClickListener(v -> set_custom_sharing.performClick());
// forward tags in replies
boolean forward_tags = sharedpreferences.getBoolean(Helper.SET_FORWARD_TAGS_IN_REPLY, false);
@ -1027,6 +1052,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
}
}
});
final LinearLayout set_live_notify_text = rootView.findViewById(R.id.set_live_notify_text);
set_live_notify_text.setOnClickListener(v -> set_live_notif.performClick());
boolean keep_background_process = sharedpreferences.getBoolean(Helper.SET_KEEP_BACKGROUND_PROCESS, true);
final CheckBox set_keep_background_process = rootView.findViewById(R.id.set_keep_background_process);
@ -1039,6 +1066,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_keep_background_process_text = rootView.findViewById(R.id.set_keep_background_process_text);
set_keep_background_process_text.setOnClickListener(v -> set_keep_background_process.performClick());
boolean capitalize = sharedpreferences.getBoolean(Helper.SET_CAPITALIZE, true);
@ -1053,6 +1082,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_capitalize_text = rootView.findViewById(R.id.set_capitalize_text);
set_capitalize_text.setOnClickListener(v -> set_capitalize.performClick());
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
@ -1125,6 +1156,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_custom_tabs_text = rootView.findViewById(R.id.set_custom_tabs_text);
set_custom_tabs_text.setOnClickListener(v -> set_custom_tabs.performClick());
final LinearLayout set_cookies_container = rootView.findViewById(R.id.set_cookies_container);
final SwitchCompat set_cookies = rootView.findViewById(R.id.set_cookies);

18
app/src/main/res/layout/fragment_settings_reveal.xml
View File

@ -51,6 +51,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_remember_position_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -81,6 +82,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_blur_sensitive_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -132,6 +134,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_long_press_media_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -193,6 +196,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_display_fedilab_features_button_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -223,7 +227,6 @@
android:layout_height="wrap_content" />
<!-- DISPLAY BOT ICON -->
<CheckBox
android:id="@+id/set_display_confirm"
android:layout_width="wrap_content"
@ -246,6 +249,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_quick_reply_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -278,6 +282,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_fit_preview_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -337,6 +342,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_display_video_preview_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -367,6 +373,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_display_content_after_fetch_more_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -890,6 +897,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_display_timeline_in_list_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -920,6 +928,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_display_news_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -955,6 +964,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_enable_crash_report_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -1014,6 +1024,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_security_provider_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -1246,6 +1257,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_custom_tabs_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -1384,6 +1396,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_live_notify_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -1415,6 +1428,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_keep_background_process_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -1472,6 +1486,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_capitalize_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -1617,6 +1632,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_custom_sharing_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"

2
app/src/main/res/values/colors.xml
View File

@ -146,6 +146,8 @@
<color name="ucrop_color_widget_rotate_mid_line">#000000</color>
<color name="ucrop_color_widget_background">#000000</color>
<color name="custom_features_button_black">#144365</color>
<color name="custom_features_panel_background">#14161B</color>
<color name="custom_features_panel_background_light">#E0E0E0</color>