Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Translation button is back (smaller)

This commit is contained in:
tom79 2017-09-14 18:54:13 +02:00
parent 67285b0876
commit afa97d8a97
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -15,6 +15,7 @@ package fr.gouv.etalab.mastodon.drawers;
* see <http://www.gnu.org/licenses>. */
import android.graphics.Paint;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AlertDialog;
import android.content.ClipData;
import android.content.ClipboardManager;
@ -199,7 +200,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
holder.status_prev4_container = (RelativeLayout) convertView.findViewById(R.id.status_prev4_container);
holder.status_reply = (ImageView) convertView.findViewById(R.id.status_reply);
holder.status_privacy = (ImageView) convertView.findViewById(R.id.status_privacy);
holder.status_translate = (TextView) convertView.findViewById(R.id.status_translate);
holder.status_translate = (FloatingActionButton) convertView.findViewById(R.id.status_translate);
holder.status_content_translated_container = (LinearLayout) convertView.findViewById(R.id.status_content_translated_container);
holder.main_container = (LinearLayout) convertView.findViewById(R.id.main_container);
holder.status_spoiler_container = (LinearLayout) convertView.findViewById(R.id.status_spoiler_container);
@ -267,7 +268,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
if( status.isNew())
holder.new_element.setVisibility(View.VISIBLE);
else
holder.new_element.setVisibility(View.GONE);
holder.new_element.setVisibility(View.INVISIBLE);
int iconSizePercent = sharedpreferences.getInt(Helper.SET_ICON_SIZE, 130);
int textSizePercent = sharedpreferences.getInt(Helper.SET_TEXT_SIZE, 110);
@ -310,7 +311,6 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
statusListAdapter.notifyDataSetChanged();
}
});
holder.status_translate.setPaintFlags(holder.status_translate.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
if( currentLocale != null && status.getLanguage() != null && !status.getLanguage().trim().equals(currentLocale) && !status.getLanguage().trim().equals("null")){
if (translator != Helper.TRANS_NONE)
holder.status_translate.setVisibility(View.VISIBLE);
@ -1097,7 +1097,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
RelativeLayout status_prev4_container;
ImageView status_reply;
ImageView status_privacy;
TextView status_translate;
FloatingActionButton status_translate;
LinearLayout status_container2;
LinearLayout status_container3;
LinearLayout main_container;

24
app/src/main/res/layout/drawer_status.xml
View File

@ -71,16 +71,25 @@
style="?attr/shapeBorder"
android:visibility="gone"
tools:ignore="ContentDescription" />
<ImageView
android:layout_centerHorizontal="true"
android:layout_marginTop="70dp"
android:id="@+id/new_element"
android:visibility="gone"
android:visibility="invisible"
android:src="@drawable/ic_fiber_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:ignore="ContentDescription" />
<android.support.design.widget.FloatingActionButton
android:layout_below="@+id/new_element"
android:visibility="gone"
android:id="@+id/status_translate"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerHorizontal="true"
app:fabSize="mini"
android:layout_marginTop="10dp"
app:srcCompat="@drawable/ic_translate" />
</RelativeLayout>
<LinearLayout
android:layout_marginStart="5dp"
@ -332,17 +341,6 @@
</LinearLayout>
</LinearLayout>
<TextView
android:visibility="gone"
android:text="@string/translate_toot"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical|end"
android:id="@+id/status_translate"
android:textColor="@color/mastodonC4"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/status_action_container"
android:layout_width="match_parent"