mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Improve icons + show title when nav drawer enabled

Browse source
This commit is contained in:
Arne 2024-09-20 17:36:28 +02:00
parent ed8b8402e0
commit b7c6684ec2
4 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -1402,27 +1402,19 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
binding.toolbarAvatar.setVisibility(View.VISIBLE);
binding.toolbarTitle.setText(conversation.getName());
} else {
if (getBooleanPreference("show_nav_drawer", R.bool.show_nav_drawer)) {
binding.toolbarTitle.setText(null);
} else {
binding.toolbarTitle.setText(R.string.app_name);
}
binding.toolbarTitle.setText(R.string.app_name);
binding.toolbar.setOnClickListener(null);
}
} else {
binding.toolbarAvatar.setVisibility(View.GONE);
if (getBooleanPreference("show_nav_drawer", R.bool.show_nav_drawer)) {
binding.toolbarTitle.setText(null);
} else {
binding.toolbarTitle.setText(R.string.app_name);
}
binding.toolbarTitle.setText(R.string.app_name);
binding.toolbar.setOnClickListener(null);
}
actionBar.setTitle(null);
actionBar.setDisplayHomeAsUpEnabled(false);
if (getBooleanPreference("show_nav_drawer", R.bool.show_nav_drawer)) {
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setHomeAsUpIndicator(R.drawable.nav_circle);
actionBar.setHomeAsUpIndicator(R.drawable.menu_24dp);
ToolbarUtils.resetActionBarOnClickListeners(binding.toolbar);
ToolbarUtils.setActionBarOnClickListener(
binding.toolbar,

4
src/main/res/xml/preferences_interface.xml
View file

@ -106,13 +106,13 @@
<SwitchPreferenceCompat
android:defaultValue="@bool/show_nav_bar"
android:key="show_nav_bar"
android:icon="@drawable/ic_navigate_next_24dp"
android:icon="@drawable/rounded_bottom_navigation_24"
android:summary="@string/pref_show_navigation_bar_summary"
android:title="@string/pref_show_navigation_bar" />
<SwitchPreferenceCompat
android:defaultValue="@bool/show_nav_drawer"
android:key="show_nav_drawer"
android:icon="@drawable/nav_circle"
android:icon="@drawable/menu_24dp"
android:summary="@string/pref_show_show_nav_drawer_summary"
android:title="@string/pref_show_show_nav_drawer" />
<ListPreference

13
src/monocleschat/res/drawable/menu_24dp.xml
View file

@ -1,10 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M120,720L120,640L840,640L840,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M160,720Q143,720 131.5,708.5Q120,697 120,680Q120,663 131.5,651.5Q143,640 160,640L800,640Q817,640 828.5,651.5Q840,663 840,680Q840,697 828.5,708.5Q817,720 800,720L160,720ZM160,520Q143,520 131.5,508.5Q120,497 120,480Q120,463 131.5,451.5Q143,440 160,440L800,440Q817,440 828.5,451.5Q840,463 840,480Q840,497 828.5,508.5Q817,520 800,520L160,520ZM160,320Q143,320 131.5,308.5Q120,297 120,280Q120,263 131.5,251.5Q143,240 160,240L800,240Q817,240 828.5,251.5Q840,263 840,280Q840,297 828.5,308.5Q817,320 800,320L160,320Z"/>
</vector>

5
src/monocleschat/res/drawable/rounded_bottom_navigation_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,600L760,600L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,600ZM200,680L200,760Q200,760 200,760Q200,760 200,760L760,760Q760,760 760,760Q760,760 760,760L760,680L200,680ZM200,680L200,680L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,680Z"/>
</vector>