Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

widget layout rocketpool and resizable #109

Merged
merged 6 commits into from Aug 4, 2022
Merged

widget layout rocketpool and resizable #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
216c037
widget layout rocketpool and resizable
manuelsc Aug 2, 2022
4e2f312
Merge branch 'main' of github.com:gobitfly/eth2-beaconchain-explorer-…
manuelsc Aug 2, 2022
ff1676e
ios widget update
Aug 3, 2022
36a99d9
Revert "type comparison"
manuelsc Aug 4, 2022
5bca394
sync settings before opening notifications, updated widget submodule,…
manuelsc Aug 4, 2022
5d1568a
Merge branch 'feature/widgetstakeshare' of github.com:gobitfly/eth2-b…
manuelsc Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Expand Up @@ -12,8 +12,8 @@ android {
applicationId "in.beaconcha.mobile"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 70
versionName "3.3.1"
versionCode 74
versionName "3.4.2"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
8 changes: 8 additions & 0 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Expand Up @@ -60,6 +60,14 @@
android:resource="@xml/widgetinfo_long" />
</receiver>

<receiver android:exported="false" android:name="in.beaconcha.mobile.widget.WidgetProviderLargeRpl">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
<meta-data android:name="android.appwidget.provider"
android:resource="@xml/widgetinfo_long_rpl" />
</receiver>

<!-- <receiver android:name="in.beaconcha.mobile.utils.BootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/in/beaconcha/mobile/widget
Open in desktop
Submodule widget updated from 2dbea9 to 06333e
28 changes: 28 additions & 0 deletions android/app/src/main/res/drawable-v31/widget_bg_long.xml
View file
Open in desktop
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>


<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item >
<shape>
<solid android:color="?attr/widgetBackground" />



<corners android:topLeftRadius="@android:dimen/system_app_widget_background_radius" android:topRightRadius="@android:dimen/system_app_widget_background_radius"
android:bottomLeftRadius="@android:dimen/system_app_widget_background_radius" android:bottomRightRadius="@android:dimen/system_app_widget_background_radius" />
</shape>
</item>

<item android:left="94dp">
<shape>
<solid android:color="?attr/widgetBackground2"/>



<corners android:topLeftRadius="0dp" android:topRightRadius="@android:dimen/system_app_widget_background_radius"
android:bottomLeftRadius="0dp" android:bottomRightRadius="@android:dimen/system_app_widget_background_radius" />
</shape>
</item>

</layer-list>
19 changes: 13 additions & 6 deletions android/app/src/main/res/layout/widget_long.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@

<LinearLayout
android:layout_width="match_parent"
android:layout_height="139dp"
android:layout_height="match_parent"
android:layout_gravity="center"

android:adjustViewBounds="true"
Expand Down Expand Up @@ -35,11 +35,16 @@
tools:ignore="UseAppTint" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">

<GridLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:foregroundGravity="center"
android:layout_margin="12dp"
android:layout_marginStart="10dp"
android:columnCount="2"
Expand All @@ -51,7 +56,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="8dp"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

Expand All @@ -78,7 +83,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="8dp"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

Expand Down Expand Up @@ -106,7 +111,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="8dp"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

Expand All @@ -133,7 +138,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="8dp"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

Expand All @@ -159,6 +164,8 @@

</GridLayout>

</LinearLayout>


</LinearLayout>

Expand Down
228 changes: 228 additions & 0 deletions android/app/src/main/res/layout/widget_long_rpl.xml
View file
Open in desktop
@@ -0,0 +1,228 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"

android:adjustViewBounds="true"
android:background="@drawable/widget_bg_long"
android:orientation="horizontal"
android:theme="@style/Widget">

<LinearLayout
android:id="@+id/widget"
android:layout_width="90dp"
android:layout_height="match_parent"
android:orientation="horizontal">

<ImageView

android:id="@+id/img_state"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_gravity="center"
android:layout_marginStart="25dp"
app:tint="?attr/statusColor"
android:tint="?attr/statusColor"
android:src="@drawable/ic_notification"
app:srcCompat="@drawable/ic_notification"
tools:ignore="UseAppTint" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">

<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:foregroundGravity="center"
android:layout_margin="6dp"
android:layout_marginStart="10dp"
android:columnCount="2"
android:orientation="horizontal"
android:rowCount="2">

<LinearLayout
android:id="@+id/currenyPair"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/txt_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:text="-"
android:textSize="16sp" />

<TextView
android:id="@+id/txt_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Last 24h"
android:textColor="?attr/descriptionTextColor"
android:textSize="13sp"
android:textStyle="normal" />

</LinearLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/txt_value3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:text="-"
android:textSize="16sp" />

<TextView
android:id="@+id/txt_description3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Effectiveness"
android:textColor="?attr/descriptionTextColor"
android:textSize="13sp"
android:textStyle="normal" />

</LinearLayout>

<LinearLayout
android:id="@+id/currenyPair2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/txt_value2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:text="-"
android:textSize="16sp" />

<TextView
android:id="@+id/txt_description2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Last 7d"
android:textColor="?attr/descriptionTextColor"
android:textSize="13sp"
android:textStyle="normal" />

</LinearLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/txt_value4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:text="-"
android:textSize="16sp" />

<TextView
android:id="@+id/txt_description4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="APR"
android:textColor="?attr/descriptionTextColor"
android:textSize="13sp"
android:textStyle="normal" />

</LinearLayout>

<LinearLayout
android:id="@+id/currenyPair3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/txt_value5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:text="-"
android:textSize="16sp" />

<TextView
android:id="@+id/txt_description5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="RPL Price"
android:textColor="?attr/descriptionTextColor"
android:textSize="13sp"
android:textStyle="normal" />

</LinearLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_margin="5dp"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/txt_value6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:text="-"
android:textSize="16sp" />

<TextView
android:id="@+id/txt_description6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="RPL APR"
android:textColor="?attr/descriptionTextColor"
android:textSize="13sp"
android:textStyle="normal" />

</LinearLayout>


</GridLayout>

</LinearLayout>


</LinearLayout>


</FrameLayout>