Skip to content

yotta / pictogram

Go to a project
Commit 0f1cf2b0 by Pablo Molina
Options

Merge branch 'issue/410' into 'develop' 

Solved #410
parents 9214f6d3 adc9d2f5
Inline Side-by-side
Showing with 12 additions and 13 deletions
android/Pictogram/app/src/main/java/com/yottacode/pictogram/net/NetService.java
...@@ -13,13 +13,11 @@ import com.yottacode.pictogram.R; ...@@ -13,13 +13,11 @@ import com.yottacode.pictogram.R;
import com.yottacode.pictogram.dao.LoginException; import com.yottacode.pictogram.dao.LoginException;
import com.yottacode.pictogram.dao.User; import com.yottacode.pictogram.dao.User;
import com.yottacode.pictogram.gui.PictogramActivity; import com.yottacode.pictogram.gui.PictogramActivity;
import com.yottacode.pictogram.gui.SerialActivity;
import com.yottacode.pictogram.tools.PCBcontext; import com.yottacode.pictogram.tools.PCBcontext;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.Hashtable;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -157,11 +155,11 @@ public class NetService implements Runnable { ...@@ -157,11 +155,11 @@ public class NetService implements Runnable {
stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT); stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
builder.setContentIntent(resultPendingIntent); builder.setContentIntent(resultPendingIntent);
if (updated) if (updated)
builder.setSmallIcon(R.drawable.picton) builder.setSmallIcon(R.drawable.application_online)
.setContentTitle("Pictogram online") .setContentTitle("Pictogram online")
.setContentText(PCBcontext.getContext().getResources().getString(R.string.pictogram_online)); .setContentText(PCBcontext.getContext().getResources().getString(R.string.pictogram_online));
else else
builder.setSmallIcon(R.drawable.pictoff) builder.setSmallIcon(R.drawable.application_offline)
.setContentTitle("Pictogram offline") .setContentTitle("Pictogram offline")
.setContentText(PCBcontext.getContext().getResources().getString(R.string.pictogram_offline)); .setContentText(PCBcontext.getContext().getResources().getString(R.string.pictogram_offline));
......
android/Pictogram/app/src/main/res/layout/activity_pictogram.xml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<ImageButton <ImageButton
android:layout_width="@dimen/picto_normal_width" android:layout_width="@dimen/picto_normal_width"
android:layout_height="@dimen/picto_normal_height" android:layout_height="@dimen/picto_normal_height"
android:src="@drawable/ic_backspace_white_48dp" android:src="@drawable/remove_picto_from_tape"
android:id="@+id/button_delete" android:id="@+id/button_delete"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/button_tts" android:layout_toLeftOf="@+id/button_tts"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<ImageButton <ImageButton
android:layout_width="@dimen/picto_normal_width" android:layout_width="@dimen/picto_normal_width"
android:layout_height="@dimen/picto_normal_height" android:layout_height="@dimen/picto_normal_height"
android:src="@drawable/ic_play_circle_filled_white_48dp" android:src="@drawable/send_tape"
android:background="@null" android:background="@null"
android:id="@+id/button_tts" android:id="@+id/button_tts"
android:adjustViewBounds="true" android:adjustViewBounds="true"
...@@ -58,9 +58,10 @@ ...@@ -58,9 +58,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/showPictoCategoriesViewButton" android:id="@+id/showPictoCategoriesViewButton"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@drawable/back64" android:src="@drawable/show_categories_grid"
android:background="#DDDDDD" android:background="#EEEEEE"
android:layout_below="@+id/tape_grid_view" /> android:layout_below="@+id/tape_grid_view"
android:scaleType="fitCenter" />
<GridView <GridView
android:id="@+id/picto_grid_view" android:id="@+id/picto_grid_view"
......
android/Pictogram/app/src/main/res/layout/activity_serial.xml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
android:layout_height="120px" android:layout_height="120px"
android:layout_marginLeft="30px" android:layout_marginLeft="30px"
android:orientation="horizontal" android:orientation="horizontal"
android:src="@drawable/logo_pictogram" android:src="@drawable/pictogram_logo"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_toRightOf="@+id/serialmail" android:layout_toRightOf="@+id/serialmail"
......
android/Pictogram/app/src/main/res/layout/activity_splash_screen.xml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
android:layout_height="120px" android:layout_height="120px"
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:orientation="vertical" android:orientation="vertical"
android:src="@drawable/logo" android:src="@drawable/yottacode_logo"
android:scaleX="0.5" android:scaleX="0.5"
android:scaleY="0.5" android:scaleY="0.5"
android:id="@+id/imageView2" android:id="@+id/imageView2"
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:layout_height="120px" android:layout_height="120px"
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:orientation="vertical" android:orientation="vertical"
android:src="@drawable/logo_pictogram" android:src="@drawable/pictogram_logo"
android:id="@+id/imageView" android:id="@+id/imageView"
android:scaleX="1.5" android:scaleX="1.5"
android:scaleY="1.5" android:scaleY="1.5"
......
android/Pictogram/app/src/main/res/layout/picto_grid_item.xml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/picto_grid_item_redcross" android:id="@+id/picto_grid_item_redcross"
android:src="@drawable/redcross" /> android:src="@drawable/disabled_picto" />
</FrameLayout> </FrameLayout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment