last improvements
This commit is contained in:
parent
a16929b116
commit
a1a775a2df
|
@ -164,6 +164,10 @@ public class SettingsActivity extends BaseActivity implements ViewAnimator.ViewA
|
||||||
drawerLayout.addDrawerListener(drawerToggle);
|
drawerLayout.addDrawerListener(drawerToggle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setActionBarTitle(String title) {
|
||||||
|
Objects.requireNonNull(getSupportActionBar()).setTitle(title);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy(){
|
public void onDestroy(){
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
|
|
|
@ -32,7 +32,7 @@ import static app.fedilab.android.helper.Helper.changeDrawableColor;
|
||||||
* Created by Konstantin on 12.01.2015.
|
* Created by Konstantin on 12.01.2015.
|
||||||
*/
|
*/
|
||||||
public class ViewAnimator<T extends Resourceble> {
|
public class ViewAnimator<T extends Resourceble> {
|
||||||
private final int ANIMATION_DURATION = 175;
|
private final int ANIMATION_DURATION = 100;
|
||||||
public static final int CIRCULAR_REVEAL_ANIMATION_DURATION = 500;
|
public static final int CIRCULAR_REVEAL_ANIMATION_DURATION = 500;
|
||||||
|
|
||||||
private AppCompatActivity appCompatActivity;
|
private AppCompatActivity appCompatActivity;
|
||||||
|
|
|
@ -75,6 +75,7 @@ import java.util.Set;
|
||||||
|
|
||||||
import app.fedilab.android.R;
|
import app.fedilab.android.R;
|
||||||
import app.fedilab.android.activities.MainActivity;
|
import app.fedilab.android.activities.MainActivity;
|
||||||
|
import app.fedilab.android.activities.SettingsActivity;
|
||||||
import app.fedilab.android.animatemenu.interfaces.ScreenShotable;
|
import app.fedilab.android.animatemenu.interfaces.ScreenShotable;
|
||||||
import app.fedilab.android.asynctasks.DownloadTrackingDomainsAsyncTask;
|
import app.fedilab.android.asynctasks.DownloadTrackingDomainsAsyncTask;
|
||||||
import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
|
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_compose = rootView.findViewById(R.id.settings_compose);
|
||||||
LinearLayout settings_battery = rootView.findViewById(R.id.settings_battery);
|
LinearLayout settings_battery = rootView.findViewById(R.id.settings_battery);
|
||||||
|
|
||||||
|
String title = "";
|
||||||
if(type == null || type.equals(TIMELINES)){
|
if(type == null || type.equals(TIMELINES)){
|
||||||
settings_timeline.setVisibility(View.VISIBLE);
|
settings_timeline.setVisibility(View.VISIBLE);
|
||||||
|
title = context.getString(R.string.timelines);
|
||||||
}else if( type == NOTIFICATIONS){
|
}else if( type == NOTIFICATIONS){
|
||||||
settings_notifications.setVisibility(View.VISIBLE);
|
settings_notifications.setVisibility(View.VISIBLE);
|
||||||
|
title = context.getString(R.string.notifications);
|
||||||
}else if( type == ADMIN){
|
}else if( type == ADMIN){
|
||||||
settings_admin.setVisibility(View.VISIBLE);
|
settings_admin.setVisibility(View.VISIBLE);
|
||||||
|
title = context.getString(R.string.administration);
|
||||||
}else if(type == INTERFACE){
|
}else if(type == INTERFACE){
|
||||||
settings_interface.setVisibility(View.VISIBLE);
|
settings_interface.setVisibility(View.VISIBLE);
|
||||||
|
title = context.getString(R.string.u_interface);
|
||||||
}else if(type == BATTERY){
|
}else if(type == BATTERY){
|
||||||
|
title = context.getString(R.string.battery);
|
||||||
settings_battery.setVisibility(View.VISIBLE);
|
settings_battery.setVisibility(View.VISIBLE);
|
||||||
}else if(type == COMPOSE){
|
}else if(type == COMPOSE){
|
||||||
settings_compose.setVisibility(View.VISIBLE);
|
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);
|
boolean auto_store = sharedpreferences.getBoolean(Helper.SET_AUTO_STORE, true);
|
||||||
|
|
|
@ -808,6 +808,7 @@
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
<CheckBox
|
<CheckBox
|
||||||
|
android:textSize="16sp"
|
||||||
android:id="@+id/set_display_admin_menu"
|
android:id="@+id/set_display_admin_menu"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
@ -816,6 +817,7 @@
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
|
android:textSize="16sp"
|
||||||
android:id="@+id/set_display_admin_statuses"
|
android:id="@+id/set_display_admin_statuses"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
|
|
@ -1095,6 +1095,10 @@
|
||||||
<string name="featured_hashtags_indication">These tags will allow to filter statuses from profiles. You will have to use the context menu for seeing them.</string>
|
<string name="featured_hashtags_indication">These tags will allow to filter statuses from profiles. You will have to use the context menu for seeing them.</string>
|
||||||
<string name="set_capitalize_indication">Automatically insert a line break after the mention to capitalize the first letter</string>
|
<string name="set_capitalize_indication">Automatically insert a line break after the mention to capitalize the first letter</string>
|
||||||
<string name="settings_title_custom_sharing_indication">Allow content creators to share statuses to their RSS feeds</string>
|
<string name="settings_title_custom_sharing_indication">Allow content creators to share statuses to their RSS feeds</string>
|
||||||
|
<string name="timelines">Timelines</string>
|
||||||
|
<string name="u_interface">Interface</string>
|
||||||
|
<string name="battery">Battery</string>
|
||||||
|
<string name="compose">Compose</string>
|
||||||
|
|
||||||
<plurals name="number_of_vote">
|
<plurals name="number_of_vote">
|
||||||
<item quantity="one">%d vote</item>
|
<item quantity="one">%d vote</item>
|
||||||
|
|
Loading…
Reference in New Issue