Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added icons in side menu

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-08 16:44:04 +01:00
parent 9402df1a0e
commit 4b074e982b
5 changed files with 83 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-xhdpi/menu_about.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
res/drawable-xhdpi/menu_assistant.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
res/drawable-xhdpi/menu_options.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

30
res/layout/side_menu_item_cell.xml
View file

@ -1,9 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_name"
style="@style/font6"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"/>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="45dp"
android:layout_width="match_parent">
<ImageView
android:id="@+id/item_icon"
android:layout_width="45dp"
android:layout_height="45dp"
android:padding="10dp"
android:src="@drawable/menu_about"/>
<TextView
android:id="@+id/item_name"
style="@style/font6"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="center_vertical"
android:paddingLeft="5dp"
android:paddingRight="16dp"/>
</LinearLayout>

67
src/android/org/linphone/activities/LinphoneActivity.java
View file

@ -36,6 +36,8 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.DrawerLayout;
@ -153,7 +155,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
private RelativeLayout sideMenuContent, quitLayout, defaultAccount;
private ListView accountsList, sideMenuItemList;
private ImageView menu;
private List<String> sideMenuItems;
private List<MenuItem> sideMenuItems;
private boolean callTransfer = false;
private boolean isOnBackground = false;
@ -1587,20 +1589,20 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
sideMenu = findViewById(R.id.side_menu);
sideMenuItems = new ArrayList<>();
if (!getResources().getBoolean(R.bool.hide_assistant_from_side_menu)) {
sideMenuItems.add(getResources().getString(R.string.menu_assistant));
sideMenuItems.add(new MenuItem(getResources().getString(R.string.menu_assistant), R.drawable.menu_assistant));
}
if (!getResources().getBoolean(R.bool.hide_settings_from_side_menu)) {
sideMenuItems.add(getResources().getString(R.string.menu_settings));
sideMenuItems.add(new MenuItem(getResources().getString(R.string.menu_settings), R.drawable.menu_options));
}
if (getResources().getBoolean(R.bool.enable_in_app_purchase)) {
sideMenuItems.add(getResources().getString(R.string.inapp));
sideMenuItems.add(new MenuItem(getResources().getString(R.string.inapp), R.drawable.menu_options));
}
sideMenuItems.add(getResources().getString(R.string.menu_about));
sideMenuItems.add(new MenuItem(getResources().getString(R.string.menu_about), R.drawable.menu_about));
sideMenuContent = findViewById(R.id.side_menu_content);
sideMenuItemList = findViewById(R.id.item_list);
menu = findViewById(R.id.side_menu_button);
sideMenuItemList.setAdapter(new ArrayAdapter<>(this, R.layout.side_menu_item_cell, sideMenuItems));
sideMenuItemList.setAdapter(new MenuAdapter(this, R.layout.side_menu_item_cell, sideMenuItems));
sideMenuItemList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
@ -1862,4 +1864,57 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
}
return -1;
}
private class MenuItem {
public String name;
public int icon;
public MenuItem(String name, int icon) {
this.name = name;
this.icon = icon;
}
public String toString() {
return name;
}
}
private class MenuAdapter extends ArrayAdapter<MenuItem> {
private List<MenuItem> mItems;
private int mResource;
public MenuAdapter(@NonNull Context context, int resource, @NonNull List<MenuItem> objects) {
super(context, resource, objects);
mResource = resource;
mItems = objects;
}
@Nullable
@Override
public MenuItem getItem(int position) {
return mItems.get(position);
}
@Override
public int getCount() {
return mItems.size();
}
@NonNull
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
LayoutInflater inflater = (LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View rowView = inflater.inflate(mResource, parent, false);
TextView textView = rowView.findViewById(R.id.item_name);
ImageView imageView = rowView.findViewById(R.id.item_icon);
MenuItem item = getItem(position);
textView.setText(item.name);
imageView.setImageResource(item.icon);
return rowView;
}
}
}