bring widget up to holo ui standards (lol)
This commit is contained in:
parent
7d3dc5900b
commit
bd75699773
@ -1,14 +1,5 @@
|
|||||||
package org.fox.ttrss.widget;
|
package org.fox.ttrss.widget;
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
|
|
||||||
import org.fox.ttrss.ApiRequest;
|
|
||||||
import org.fox.ttrss.R;
|
|
||||||
import org.fox.ttrss.util.SimpleLoginManager;
|
|
||||||
|
|
||||||
import com.google.gson.JsonElement;
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
|
|
||||||
import android.app.Service;
|
import android.app.Service;
|
||||||
import android.appwidget.AppWidgetManager;
|
import android.appwidget.AppWidgetManager;
|
||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
@ -17,9 +8,17 @@ import android.content.SharedPreferences;
|
|||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.View;
|
|
||||||
import android.widget.RemoteViews;
|
import android.widget.RemoteViews;
|
||||||
|
|
||||||
|
import com.google.gson.JsonElement;
|
||||||
|
import com.google.gson.JsonObject;
|
||||||
|
|
||||||
|
import org.fox.ttrss.ApiRequest;
|
||||||
|
import org.fox.ttrss.R;
|
||||||
|
import org.fox.ttrss.util.SimpleLoginManager;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
public class WidgetUpdateService extends Service {
|
public class WidgetUpdateService extends Service {
|
||||||
private final String TAG = this.getClass().getSimpleName();
|
private final String TAG = this.getClass().getSimpleName();
|
||||||
|
|
||||||
@ -51,8 +50,7 @@ public class WidgetUpdateService extends Service {
|
|||||||
final AppWidgetManager manager = AppWidgetManager.getInstance(this);
|
final AppWidgetManager manager = AppWidgetManager.getInstance(this);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
view.setTextViewText(R.id.counter, String.valueOf(""));
|
view.setTextViewText(R.id.counter, String.valueOf("..."));
|
||||||
view.setViewVisibility(R.id.progress, View.VISIBLE);
|
|
||||||
|
|
||||||
manager.updateAppWidget(thisWidget, view);
|
manager.updateAppWidget(thisWidget, view);
|
||||||
|
|
||||||
@ -80,7 +78,6 @@ public class WidgetUpdateService extends Service {
|
|||||||
if (content != null) {
|
if (content != null) {
|
||||||
int unread = content.get("unread").getAsInt();
|
int unread = content.get("unread").getAsInt();
|
||||||
|
|
||||||
view.setViewVisibility(R.id.progress, View.GONE);
|
|
||||||
view.setTextViewText(R.id.counter, String.valueOf(unread));
|
view.setTextViewText(R.id.counter, String.valueOf(unread));
|
||||||
manager.updateAppWidget(thisWidget, view);
|
manager.updateAppWidget(thisWidget, view);
|
||||||
|
|
||||||
@ -91,7 +88,6 @@ public class WidgetUpdateService extends Service {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
view.setViewVisibility(R.id.progress, View.GONE);
|
|
||||||
view.setTextViewText(R.id.counter, "?");
|
view.setTextViewText(R.id.counter, "?");
|
||||||
manager.updateAppWidget(thisWidget, view);
|
manager.updateAppWidget(thisWidget, view);
|
||||||
}
|
}
|
||||||
@ -112,7 +108,6 @@ public class WidgetUpdateService extends Service {
|
|||||||
@Override
|
@Override
|
||||||
protected void onLoginFailed(int requestId, ApiRequest ar) {
|
protected void onLoginFailed(int requestId, ApiRequest ar) {
|
||||||
|
|
||||||
view.setViewVisibility(R.id.progress, View.GONE);
|
|
||||||
view.setTextViewText(R.id.counter, "?");
|
view.setTextViewText(R.id.counter, "?");
|
||||||
manager.updateAppWidget(thisWidget, view);
|
manager.updateAppWidget(thisWidget, view);
|
||||||
}
|
}
|
||||||
@ -132,7 +127,6 @@ public class WidgetUpdateService extends Service {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
||||||
view.setViewVisibility(R.id.progress, View.GONE);
|
|
||||||
view.setTextViewText(R.id.counter, getString(R.string.app_name));
|
view.setTextViewText(R.id.counter, getString(R.string.app_name));
|
||||||
manager.updateAppWidget(thisWidget, view);
|
manager.updateAppWidget(thisWidget, view);
|
||||||
|
|
||||||
|
Binary file not shown.
After Width: | Height: | Size: 798 B |
BIN
org.fox.ttrss/src/main/res/drawable-hdpi/appwidget_dark_bg.9.png
Normal file
BIN
org.fox.ttrss/src/main/res/drawable-hdpi/appwidget_dark_bg.9.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 731 B |
Binary file not shown.
After Width: | Height: | Size: 856 B |
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
After Width: | Height: | Size: 1005 B |
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
@ -0,0 +1,24 @@
|
|||||||
|
<!--
|
||||||
|
Copyright 2011 Google Inc.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:drawable="@drawable/appwidget_bg_pressed" android:state_pressed="true" />
|
||||||
|
<item android:drawable="@drawable/appwidget_dark_bg_focused"
|
||||||
|
android:state_focused="true"
|
||||||
|
android:state_enabled="true"
|
||||||
|
android:state_window_focused="true" />
|
||||||
|
<item android:drawable="@drawable/appwidget_dark_bg" />
|
||||||
|
</selector>
|
@ -1,42 +1,34 @@
|
|||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/widget_main"
|
android:id="@+id/widget_main"
|
||||||
android:layout_width="match_parent"
|
android:padding="@dimen/widget_margin"
|
||||||
android:layout_height="fill_parent" >
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" >
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:background="@drawable/appwidget_dark_bg_clickable"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:minWidth="110dp"
|
||||||
|
android:padding="8dp"
|
||||||
android:orientation="vertical" >
|
android:orientation="vertical" >
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/imageView1"
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:paddingTop="2dp"
|
|
||||||
android:src="@drawable/ic_launcher" />
|
android:src="@drawable/ic_launcher" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/counter"
|
android:id="@+id/counter"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center"
|
||||||
android:gravity="center"
|
android:gravity="center_horizontal"
|
||||||
android:text="-1"
|
android:text="123"
|
||||||
android:shadowColor="#cc000000"
|
|
||||||
android:shadowDx="0"
|
|
||||||
android:shadowDy="3"
|
|
||||||
android:shadowRadius="3"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||||
android:textColor="@android:color/primary_text_dark" />
|
android:textColor="@android:color/primary_text_dark"
|
||||||
|
android:textSize="13sp" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:id="@+id/progress"
|
|
||||||
style="?android:attr/progressBarStyleLarge"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
@ -2,4 +2,5 @@
|
|||||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||||
|
<dimen name="widget_margin">0dp</dimen> <!-- we're v14+ anyway -->
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
android:minHeight="40dp"
|
android:minHeight="40dp"
|
||||||
android:updatePeriodMillis="86400000"
|
android:updatePeriodMillis="86400000"
|
||||||
android:initialLayout="@layout/widget_small"
|
android:initialLayout="@layout/widget_small"
|
||||||
android:resizeMode="horizontal|vertical"
|
android:resizeMode="none"
|
||||||
android:widgetCategory="home_screen">
|
android:widgetCategory="home_screen">
|
||||||
</appwidget-provider>
|
</appwidget-provider>
|
Loading…
Reference in New Issue
Block a user