Multiple bug fixes

This commit is contained in:
Tommaso Berlose
2017-11-06 01:13:05 +01:00
parent 748249fed5
commit 170add3073
17 changed files with 431 additions and 265 deletions

View File

@ -81,200 +81,204 @@
android:layout_gravity="center_horizontal"
android:id="@+id/loader"
android:layout_margin="16dp"/>
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/products_list"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:visibility="gone"
android:orientation="vertical">
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:id="@+id/action_donation_coffee"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
android:id="@+id/products_list"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:visibility="gone"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_coffee"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
android:gravity="center_vertical"
android:id="@+id/action_donation_coffee"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_coffee"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_coffee"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:id="@+id/action_donation_donuts"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_coffee"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_donuts"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
android:gravity="center_vertical"
android:id="@+id/action_donation_donuts"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_donuts"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_donuts"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:id="@+id/action_donation_breakfast"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_donuts"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_breakfast"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
android:gravity="center_vertical"
android:id="@+id/action_donation_breakfast"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_breakfast"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_breakfast"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:id="@+id/action_donation_lunch"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_breakfast"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_lunch"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
android:gravity="center_vertical"
android:id="@+id/action_donation_lunch"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_lunch"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_lunch"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:id="@+id/action_donation_dinner"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_lunch"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_dinner"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
android:gravity="center_vertical"
android:id="@+id/action_donation_dinner"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:text="@string/donation_dinner"
android:paddingRight="8dp"
android:paddingLeft="40dp"
android:textColor="@color/dark_grey"
android:textAppearance="?android:textAppearanceButton"/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_dinner"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
app:cardCornerRadius="2dp"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/black_10"
app:cardPreventCornerOverlap="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="@color/black_50"
android:id="@+id/import_donation_dinner"
android:textSize="12sp"/>
</android.support.v7.widget.CardView>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView

View File

@ -34,6 +34,7 @@
android:gravity="right"
android:ellipsize="end"
android:text="@string/loading_text"
android:includeFontPadding="false"
style="@style/AnotherWidget.Title"/>
<LinearLayout
android:orientation="horizontal"
@ -49,6 +50,7 @@
android:layout_marginEnd="8dp"
android:id="@+id/divider1"
android:text="@string/divider"
android:includeFontPadding="false"
style="@style/AnotherWidget.Subtitle"/>
<ImageView
android:layout_width="20dp"
@ -61,6 +63,7 @@
android:layout_height="wrap_content"
style="@style/AnotherWidget.Date.Big"
android:ellipsize="marquee"
android:includeFontPadding="false"
android:id="@+id/temp"/>
</LinearLayout>
</LinearLayout>
@ -86,6 +89,7 @@
android:lines="1"
android:gravity="right"
android:ellipsize="end"
android:includeFontPadding="false"
android:layout_height="wrap_content"
style="@style/AnotherWidget.Title" />
<LinearLayout
@ -97,6 +101,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:includeFontPadding="false"
style="@style/AnotherWidget.Title" />
</LinearLayout>
</LinearLayout>
@ -112,8 +117,8 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginEnd="4dp"
android:layout_marginStart="4dp"
android:id="@+id/second_row_icon"
@ -124,6 +129,7 @@
android:lines="1"
android:maxLines="1"
android:ellipsize="end"
android:includeFontPadding="false"
android:layout_height="wrap_content"
style="@style/AnotherWidget.Subtitle" />
</LinearLayout>
@ -146,6 +152,7 @@
android:layout_marginEnd="8dp"
android:id="@+id/divider2"
android:text="@string/divider"
android:includeFontPadding="false"
style="@style/AnotherWidget.Subtitle"/>
<ImageView
android:layout_width="18dp"
@ -159,6 +166,7 @@
android:layout_marginStart="4dp"
android:ellipsize="marquee"
android:layout_marginEnd="4dp"
android:includeFontPadding="false"
android:id="@+id/calendar_temp"/>
</LinearLayout>
</LinearLayout>

View File

@ -11,11 +11,18 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:alpha="0"
android:layout_centerInParent="true">
<include layout="@layout/the_widget"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:id="@+id/intent_container" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16dp"
android:visibility="gone"
android:id="@+id/bottom_divider"
android:orientation="vertical" />
</LinearLayout>
</RelativeLayout>

View File

@ -149,4 +149,6 @@
<string name="donation_dinner">Una Cena Costosa</string>
<string name="donation_breakfast">Una Colazione Inglese</string>
<string name="donation_lunch">Una Pranzo Veloce</string>
<string name="background_service_title">Another Widget è attivo</string>
<string name="background_service_subtitle">AW è attivo in background</string>
</resources>

View File

@ -154,4 +154,6 @@
<string name="donation_dinner">An Expensive Dinner</string>
<string name="donation_breakfast">An English Breakfast</string>
<string name="donation_lunch">A Quick Lunch</string>
<string name="background_service_title">Another Widget is Running</string>
<string name="background_service_subtitle">AW is running in the background</string>
</resources>

View File

@ -3,10 +3,10 @@
android:initialKeyguardLayout="@layout/the_widget"
android:initialLayout="@layout/the_widget"
android:minHeight="80dp"
android:minWidth="380dp"
android:minWidth="300dp"
android:configure="com.tommasoberlose.anotherwidget.ui.activity.MainActivity"
android:minResizeHeight="60dp"
android:minResizeWidth="380dp"
android:minResizeWidth="300dp"
android:previewImage="@drawable/widget_preview"
android:resizeMode="vertical"
android:updatePeriodMillis="60000"

View File

@ -3,9 +3,9 @@
android:initialKeyguardLayout="@layout/the_widget"
android:initialLayout="@layout/the_widget"
android:minHeight="80dp"
android:minWidth="380dp"
android:minWidth="300dp"
android:minResizeHeight="60dp"
android:minResizeWidth="380dp"
android:minResizeWidth="300dp"
android:previewImage="@drawable/widget_preview"
android:resizeMode="vertical"
android:updatePeriodMillis="60000"