diff --git a/app/build.gradle b/app/build.gradle index f0bdf5d..8b7c67c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.arastta" minSdkVersion 15 targetSdkVersion 23 - versionCode 10 - versionName "1.1.0" + versionCode 11 + versionName "1.1.1" } buildTypes { release { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 01b0e29..eacd9d9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,7 +35,8 @@ - + @@ -51,6 +52,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/arastta/AppWidget.java b/app/src/main/java/com/arastta/AppWidget.java index e202cab..39350e8 100644 --- a/app/src/main/java/com/arastta/AppWidget.java +++ b/app/src/main/java/com/arastta/AppWidget.java @@ -26,6 +26,7 @@ public class AppWidget extends AppWidgetProvider boolean Working = false; static String APPWIDGET_UPDATE = "android.appwidget.action.APPWIDGET_UPDATE"; + static String SETTING = "Setting"; static String REFRESH = "Refresh"; static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) @@ -42,12 +43,13 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, Intent setting = new Intent(context, AppWidgetSettings.class); setting.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); + setting.setAction(String.valueOf(appWidgetId)); PendingIntent setting_ = PendingIntent.getActivity(context, 0, setting, PendingIntent.FLAG_UPDATE_CURRENT); remoteViews.setOnClickPendingIntent(R.id.WidgetSettings, setting_); Intent refresh = new Intent(context, AppWidget.class); refresh.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); - refresh.setAction(REFRESH); + refresh.setAction(REFRESH+String.valueOf(appWidgetId)); PendingIntent refresh_ = PendingIntent.getBroadcast(context, 0, refresh, PendingIntent.FLAG_UPDATE_CURRENT); remoteViews.setOnClickPendingIntent(R.id.WidgetRefresh, refresh_); @@ -64,6 +66,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a for (int i=0; i diff --git a/app/src/main/res/layout/activity_master2.xml b/app/src/main/res/layout/activity_master2.xml index 8d32444..24c76a5 100644 --- a/app/src/main/res/layout/activity_master2.xml +++ b/app/src/main/res/layout/activity_master2.xml @@ -21,10 +21,11 @@ android:id="@+id/MenuTitle" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/BackButton" + android:layout_marginRight="8dp" android:maxLines="1" android:ellipsize="end" - android:layout_toRightOf="@+id/BackButton" - android:layout_centerVertical="true" android:textColor="@android:color/white" android:textSize="18dp"/> diff --git a/app/src/main/res/layout/item_customers.xml b/app/src/main/res/layout/item_customers.xml index 0d25dfc..83a1962 100644 --- a/app/src/main/res/layout/item_customers.xml +++ b/app/src/main/res/layout/item_customers.xml @@ -3,24 +3,30 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@null" > - - + android:background="@drawable/shadow_bg" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> @@ -45,6 +51,7 @@ + android:background="@drawable/shadow_bg" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> - - + android:background="@drawable/shadow_bg"> @@ -45,6 +48,7 @@