diff --git a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java index 613cdc87f..538592b52 100644 --- a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java @@ -164,6 +164,10 @@ public class SettingsActivity extends BaseActivity implements ViewAnimator.ViewA drawerLayout.addDrawerListener(drawerToggle); } + public void setActionBarTitle(String title) { + Objects.requireNonNull(getSupportActionBar()).setTitle(title); + } + @Override public void onDestroy(){ super.onDestroy(); diff --git a/app/src/main/java/app/fedilab/android/animatemenu/util/ViewAnimator.java b/app/src/main/java/app/fedilab/android/animatemenu/util/ViewAnimator.java index 3744452bf..ae5b362b8 100644 --- a/app/src/main/java/app/fedilab/android/animatemenu/util/ViewAnimator.java +++ b/app/src/main/java/app/fedilab/android/animatemenu/util/ViewAnimator.java @@ -32,7 +32,7 @@ import static app.fedilab.android.helper.Helper.changeDrawableColor; * Created by Konstantin on 12.01.2015. */ public class ViewAnimator { - private final int ANIMATION_DURATION = 175; + private final int ANIMATION_DURATION = 100; public static final int CIRCULAR_REVEAL_ANIMATION_DURATION = 500; private AppCompatActivity appCompatActivity; diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java index 3e5ed717e..172d044a2 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java @@ -75,6 +75,7 @@ import java.util.Set; import app.fedilab.android.R; import app.fedilab.android.activities.MainActivity; +import app.fedilab.android.activities.SettingsActivity; import app.fedilab.android.animatemenu.interfaces.ScreenShotable; import app.fedilab.android.asynctasks.DownloadTrackingDomainsAsyncTask; import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask; @@ -230,19 +231,28 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable LinearLayout settings_compose = rootView.findViewById(R.id.settings_compose); LinearLayout settings_battery = rootView.findViewById(R.id.settings_battery); + String title = ""; if(type == null || type.equals(TIMELINES)){ settings_timeline.setVisibility(View.VISIBLE); + title = context.getString(R.string.timelines); }else if( type == NOTIFICATIONS){ settings_notifications.setVisibility(View.VISIBLE); + title = context.getString(R.string.notifications); }else if( type == ADMIN){ settings_admin.setVisibility(View.VISIBLE); + title = context.getString(R.string.administration); }else if(type == INTERFACE){ settings_interface.setVisibility(View.VISIBLE); + title = context.getString(R.string.u_interface); }else if(type == BATTERY){ + title = context.getString(R.string.battery); settings_battery.setVisibility(View.VISIBLE); }else if(type == COMPOSE){ settings_compose.setVisibility(View.VISIBLE); + title = context.getString(R.string.compose); } + ((SettingsActivity) context) + .setActionBarTitle(title); boolean auto_store = sharedpreferences.getBoolean(Helper.SET_AUTO_STORE, true); diff --git a/app/src/main/res/layout/fragment_settings_reveal.xml b/app/src/main/res/layout/fragment_settings_reveal.xml index 7bf1412ea..603b3431f 100644 --- a/app/src/main/res/layout/fragment_settings_reveal.xml +++ b/app/src/main/res/layout/fragment_settings_reveal.xml @@ -808,6 +808,7 @@ android:layout_height="match_parent" android:orientation="vertical"> These tags will allow to filter statuses from profiles. You will have to use the context menu for seeing them. Automatically insert a line break after the mention to capitalize the first letter Allow content creators to share statuses to their RSS feeds + Timelines + Interface + Battery + Compose %d vote