Merge branch 'working' into 'develop'
some changes Closes #466 See merge request tom79/mastalab!2421
This commit is contained in:
commit
ea5201ce7c
|
@ -2342,6 +2342,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
case R.id.action_mute:
|
case R.id.action_mute:
|
||||||
builderInner = new AlertDialog.Builder(context, style);
|
builderInner = new AlertDialog.Builder(context, style);
|
||||||
builderInner.setTitle(stringArrayConf[0]);
|
builderInner.setTitle(stringArrayConf[0]);
|
||||||
|
builderInner.setMessage(status.getAccount().getAcct());
|
||||||
doAction = API.StatusAction.MUTE;
|
doAction = API.StatusAction.MUTE;
|
||||||
break;
|
break;
|
||||||
case R.id.action_bookmark:
|
case R.id.action_bookmark:
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<solid android:color="@color/bot_background"/>
|
||||||
|
<corners android:radius="4dp"/>
|
||||||
|
</shape>
|
||||||
|
|
|
@ -2,36 +2,36 @@
|
||||||
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<path android:fillColor="#00000000"
|
<path android:fillColor="#00000000"
|
||||||
android:pathData="M26,27H12A11,11 0,0 1,12 5H26A11,11 0,0 1,37 16"
|
android:pathData="M26,27H12A11,11 0,0 1,12 5H26A11,11 0,0 1,37 16"
|
||||||
android:strokeColor="#2b90d9" android:strokeLineCap="round"
|
android:strokeColor="#B6E9FF" android:strokeLineCap="round"
|
||||||
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
||||||
<path android:fillColor="#00000000"
|
<path android:fillColor="#00000000"
|
||||||
android:pathData="M26,23H12A7,7 0,0 1,12 9H26a7,7 0,0 1,7 7"
|
android:pathData="M26,23H12A7,7 0,0 1,12 9H26a7,7 0,0 1,7 7"
|
||||||
android:strokeColor="#2b90d9" android:strokeLineCap="round"
|
android:strokeColor="#B6E9FF" android:strokeLineCap="round"
|
||||||
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
||||||
<path android:fillColor="#2b90d9" android:pathData="M25.9091,15.2265a1.2954,1.6193 0,1 0,2.5909 0a1.2954,1.6193 0,1 0,-2.5909 0z"/>
|
<path android:fillColor="#B6E9FF" android:pathData="M25.9091,15.2265a1.2954,1.6193 0,1 0,2.5909 0a1.2954,1.6193 0,1 0,-2.5909 0z"/>
|
||||||
<path android:fillColor="#2b90d9" android:pathData="M9.5,15.2265a1.2954,1.6193 0,1 0,2.5909 0a1.2954,1.6193 0,1 0,-2.5909 0z"/>
|
<path android:fillColor="#B6E9FF" android:pathData="M9.5,15.2265a1.2954,1.6193 0,1 0,2.5909 0a1.2954,1.6193 0,1 0,-2.5909 0z"/>
|
||||||
<path android:fillColor="#00000000"
|
<path android:fillColor="#00000000"
|
||||||
android:pathData="M14.6818,16.1789a5.4972,5.4972 0,0 0,8.6364 0"
|
android:pathData="M14.6818,16.1789a5.4972,5.4972 0,0 0,8.6364 0"
|
||||||
android:strokeColor="#2b90d9" android:strokeLineCap="round"
|
android:strokeColor="#B6E9FF" android:strokeLineCap="round"
|
||||||
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
||||||
<path android:fillColor="#00000000"
|
<path android:fillColor="#00000000"
|
||||||
android:pathData="M38,26.8792m-1.1776,8.9216a8.999,8.999 52.5191,1 1,2.3552 -17.8432a8.999,8.999 52.5191,1 1,-2.3552 17.8432"
|
android:pathData="M38,26.8792m-1.1776,8.9216a8.999,8.999 52.5191,1 1,2.3552 -17.8432a8.999,8.999 52.5191,1 1,-2.3552 17.8432"
|
||||||
android:strokeColor="#2b90d9" android:strokeWidth="2"/>
|
android:strokeColor="#B6E9FF" android:strokeWidth="2"/>
|
||||||
<path android:fillColor="#00000000"
|
<path android:fillColor="#00000000"
|
||||||
android:pathData="M33.3333,34.6667L30,40.6667"
|
android:pathData="M33.3333,34.6667L30,40.6667"
|
||||||
android:strokeColor="#2b90d9" android:strokeLineCap="round"
|
android:strokeColor="#B6E9FF" android:strokeLineCap="round"
|
||||||
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
||||||
<path android:fillColor="#00000000" android:pathData="M19,1L19,5"
|
<path android:fillColor="#00000000" android:pathData="M19,1L19,5"
|
||||||
android:strokeColor="#2b90d9" android:strokeLineCap="round"
|
android:strokeColor="#B6E9FF" android:strokeLineCap="round"
|
||||||
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
||||||
<path android:fillColor="#00000000"
|
<path android:fillColor="#00000000"
|
||||||
android:pathData="M6,40H27.302a3.6336,3.6336 0,0 1,3.6931 3.3118A3.5002,3.5002 0,0 1,27.5 47H6a5,5 0,0 1,-5 -5V32a5,5 0,0 1,5 -5H16"
|
android:pathData="M6,40H27.302a3.6336,3.6336 0,0 1,3.6931 3.3118A3.5002,3.5002 0,0 1,27.5 47H6a5,5 0,0 1,-5 -5V32a5,5 0,0 1,5 -5H16"
|
||||||
android:strokeColor="#2b90d9" android:strokeLineCap="round"
|
android:strokeColor="#B6E9FF" android:strokeLineCap="round"
|
||||||
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
||||||
<path android:fillColor="#00000000" android:pathData="M8,31h8v4h-8z"
|
<path android:fillColor="#00000000" android:pathData="M8,31h8v4h-8z"
|
||||||
android:strokeColor="#2b90d9" android:strokeLineCap="round"
|
android:strokeColor="#B6E9FF" android:strokeLineCap="round"
|
||||||
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
||||||
<path android:fillColor="#00000000" android:pathData="M24,40L24,47"
|
<path android:fillColor="#00000000" android:pathData="M24,40L24,47"
|
||||||
android:strokeColor="#2b90d9" android:strokeLineCap="round"
|
android:strokeColor="#B6E9FF" android:strokeLineCap="round"
|
||||||
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
android:strokeLineJoin="round" android:strokeWidth="2"/>
|
||||||
</vector>
|
</vector>
|
||||||
|
|
|
@ -38,16 +38,6 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
>
|
>
|
||||||
<ImageView
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_width="15dp"
|
|
||||||
android:layout_height="15dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:src="@drawable/ic_bot"
|
|
||||||
android:id="@+id/status_account_bot"
|
|
||||||
android:layout_alignParentStart="true" />
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="50dp"
|
android:layout_width="50dp"
|
||||||
android:layout_height="50dp"
|
android:layout_height="50dp"
|
||||||
|
@ -55,6 +45,17 @@
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
android:id="@+id/status_account_profile"
|
android:id="@+id/status_account_profile"
|
||||||
android:contentDescription="@string/profile_picture"/>
|
android:contentDescription="@string/profile_picture"/>
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/status_account_bot"
|
||||||
|
android:layout_width="25dp"
|
||||||
|
android:layout_height="25dp"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:background="@drawable/bot_background_round_corner"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:src="@drawable/ic_bot"
|
||||||
|
android:visibility="gone" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/conversation_pp"
|
android:id="@+id/conversation_pp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
|
|
@ -42,16 +42,6 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
>
|
>
|
||||||
<ImageView
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_width="15dp"
|
|
||||||
android:layout_height="15dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:src="@drawable/ic_bot"
|
|
||||||
android:id="@+id/status_account_bot"
|
|
||||||
android:layout_alignParentStart="true" />
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="40dp"
|
android:layout_width="40dp"
|
||||||
android:layout_height="40dp"
|
android:layout_height="40dp"
|
||||||
|
@ -59,7 +49,18 @@
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
android:id="@+id/status_account_profile"
|
android:id="@+id/status_account_profile"
|
||||||
android:contentDescription="@string/profile_picture" />
|
android:contentDescription="@string/profile_picture" />
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/status_account_bot"
|
||||||
|
android:layout_width="18dp"
|
||||||
|
android:layout_height="18dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@drawable/bot_background_round_corner"
|
||||||
|
android:src="@drawable/ic_bot"
|
||||||
|
android:visibility="gone" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/conversation_pp"
|
android:id="@+id/conversation_pp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
|
|
@ -43,16 +43,6 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
>
|
>
|
||||||
<ImageView
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_width="15dp"
|
|
||||||
android:layout_height="15dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:src="@drawable/ic_bot"
|
|
||||||
android:id="@+id/status_account_bot"
|
|
||||||
android:layout_alignParentStart="true" />
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="50dp"
|
android:layout_width="50dp"
|
||||||
android:layout_height="50dp"
|
android:layout_height="50dp"
|
||||||
|
@ -60,6 +50,18 @@
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
android:id="@+id/status_account_profile"
|
android:id="@+id/status_account_profile"
|
||||||
android:contentDescription="@string/profile_picture" />
|
android:contentDescription="@string/profile_picture" />
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/status_account_bot"
|
||||||
|
android:layout_width="20dp"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:background="@drawable/bot_background_round_corner"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:src="@drawable/ic_bot"
|
||||||
|
android:visibility="gone" />
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="45dp"
|
android:layout_width="45dp"
|
||||||
android:layout_height="45dp"
|
android:layout_height="45dp"
|
||||||
|
|
|
@ -120,4 +120,6 @@
|
||||||
<color name="console_name">#5E8D87</color>
|
<color name="console_name">#5E8D87</color>
|
||||||
<color name="console_reblog_name">#5F819D</color>
|
<color name="console_reblog_name">#5F819D</color>
|
||||||
<color name="console_marker">#CC6666</color>
|
<color name="console_marker">#CC6666</color>
|
||||||
|
|
||||||
|
<color name="bot_background">#B3808080</color>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue