diff options
Diffstat (limited to 'app/src/main')
6 files changed, 52 insertions, 66 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java index ea97fc0fd..337880317 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java @@ -342,8 +342,8 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity { final Button back = view.findViewById(R.id.butGoMainscreen); sync.setOnClickListener(v -> { - SyncService.sync(GpodnetAuthenticationActivity.this); finish(); + SyncService.sync(getApplicationContext()); }); back.setOnClickListener(v -> { Intent intent = new Intent(GpodnetAuthenticationActivity.this, MainActivity.class); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java index 95af40d47..25532f6fa 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java @@ -52,6 +52,9 @@ public class GpodderPreferencesFragment extends PreferenceFragmentCompat { @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) public void syncStatusChanged(SyncServiceEvent event) { + if (!GpodnetPreferences.loggedIn()) { + return; + } if (event.getMessageResId() == R.string.sync_status_error || event.getMessageResId() == R.string.sync_status_success) { updateLastGpodnetSyncReport(SyncService.isLastSyncSuccessful(getContext()), @@ -117,7 +120,6 @@ public class GpodderPreferencesFragment extends PreferenceFragmentCompat { SyncService.getLastSyncAttempt(getContext())); } else { findPreference(PREF_GPODNET_LOGOUT).setSummary(null); - updateLastGpodnetSyncReport(false, 0); } findPreference(PREF_GPODNET_HOSTNAME).setSummary(GpodnetPreferences.getHostname()); } diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml index e8948fc52..895b0999c 100644 --- a/app/src/main/res/layout/gpodnetauth_credentials.xml +++ b/app/src/main/res/layout/gpodnetauth_credentials.xml @@ -1,28 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <TextView - android:id="@id/txtvTitle" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp"> + + <ImageView + android:id="@id/icon" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/gpodnetauth_login_title" - android:layout_alignParentTop="true" - android:layout_margin="16dp" - style="@style/AntennaPod.TextView.Heading"/> + android:src="@drawable/gpodder_icon" /> <TextView android:id="@id/txtvDescription" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/gpodnetauth_login_descr" - android:layout_below="@id/txtvTitle" + android:layout_below="@id/icon" android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorSecondary" - android:layout_margin="16dp"/> + android:textColor="?android:attr/textColorPrimary"/> <EditText android:id="@+id/etxtUsername" @@ -30,7 +27,6 @@ android:layout_height="wrap_content" android:hint="@string/username_label" android:layout_below="@id/txtvDescription" - android:layout_margin="8dp" android:focusable="true" android:focusableInTouchMode="true" android:cursorVisible="true" @@ -46,7 +42,6 @@ android:hint="@string/password_label" android:layout_below="@id/etxtUsername" android:inputType="textPassword" - android:layout_margin="8dp" android:focusable="true" android:focusableInTouchMode="true" android:cursorVisible="true" @@ -60,8 +55,7 @@ android:layout_below="@id/etxtPassword" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" - android:text="@string/gpodnetauth_login_butLabel" - android:layout_margin="8dp"/> + android:text="@string/gpodnetauth_login_butLabel"/> <TextView android:id="@+id/txtvError" @@ -94,8 +88,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorSecondary" - android:layout_margin="16dp" + android:textColor="?android:attr/textColorPrimary" + android:layout_marginTop="16dp" android:text="@string/gpodnetauth_login_register" android:autoLink="web" android:layout_below="@id/butLogin"/> diff --git a/app/src/main/res/layout/gpodnetauth_device.xml b/app/src/main/res/layout/gpodnetauth_device.xml index 1f38bf457..7837121e1 100644 --- a/app/src/main/res/layout/gpodnetauth_device.xml +++ b/app/src/main/res/layout/gpodnetauth_device.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent"> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp"> <TextView android:id="@+id/txtvTitle" @@ -11,7 +12,7 @@ android:layout_height="wrap_content" android:text="@string/gpodnetauth_device_title" android:layout_alignParentTop="true" - android:layout_margin="16dp" + android:layout_marginBottom="16dp" style="@style/AntennaPod.TextView.Heading"/> <TextView @@ -21,8 +22,7 @@ android:text="@string/gpodnetauth_device_descr" android:layout_below="@id/txtvTitle" android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorSecondary" - android:layout_margin="16dp"/> + android:textColor="?android:attr/textColorPrimary"/> <EditText android:id="@+id/etxtCaption" @@ -30,7 +30,6 @@ android:layout_height="wrap_content" android:hint="@string/gpodnetauth_device_caption" android:layout_below="@id/txtvDescription" - android:layout_margin="8dp" android:imeOptions="flagNoFullscreen"/> <TextView @@ -39,29 +38,21 @@ android:layout_height="wrap_content" android:text="@string/gpodnetauth_device_deviceID" android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorSecondary" - android:layout_margin="8dp" - android:layout_alignTop="@+id/etxtDeviceID" - android:layout_alignLeft="@+id/etxtCaption" - android:layout_alignStart="@+id/etxtCaption"/> + android:layout_below="@id/etxtCaption"/> <EditText android:id="@+id/etxtDeviceID" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/etxtCaption" - android:layout_toRightOf="@id/txtvDeviceID" - android:layout_toEndOf="@id/txtvDeviceID" + android:layout_below="@id/txtvDeviceID" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" - android:layout_margin="8dp" android:imeOptions="flagNoFullscreen"/> <Button android:id="@+id/butCreateNewDevice" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_below="@id/etxtDeviceID" @@ -77,7 +68,6 @@ android:layout_toLeftOf="@id/butCreateNewDevice" android:layout_toStartOf="@id/butCreateNewDevice" android:textColor="@color/download_failed_red" - android:layout_margin="16dp" android:textSize="@dimen/text_size_small" tools:text="Error message" tools:background="@android:color/holo_green_dark" /> @@ -100,30 +90,25 @@ android:layout_height="wrap_content" android:text="@string/gpodnetauth_device_chooseExistingDevice" android:layout_below="@id/butCreateNewDevice" + android:textColor="?android:attr/textColorPrimary" android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorSecondary" - android:layout_margin="16dp"/> + android:layout_marginTop="32dp"/> <Button android:id="@+id/butChooseExistingDevice" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/gpodnetauth_device_butChoose" android:layout_below="@+id/spinnerChooseDevice" - android:layout_alignLeft="@+id/butCreateNewDevice" - android:layout_alignStart="@+id/butCreateNewDevice" - android:layout_alignRight="@+id/butCreateNewDevice" - android:layout_alignEnd="@+id/butCreateNewDevice"/> + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> <Spinner android:id="@+id/spinnerChooseDevice" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/txtvChooseExistingDevice" android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_margin="8dp" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> + android:layout_alignParentStart="true"/> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/gpodnetauth_finish.xml b/app/src/main/res/layout/gpodnetauth_finish.xml index 71873201a..fdaa0d5d0 100644 --- a/app/src/main/res/layout/gpodnetauth_finish.xml +++ b/app/src/main/res/layout/gpodnetauth_finish.xml @@ -1,16 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp"> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> + <ImageView + android:id="@id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/gpodder_icon" /> <TextView android:id="@+id/txtvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_below="@id/icon" android:text="@string/gpodnetauth_finish_title" - android:layout_alignParentTop="true" - android:layout_margin="16dp" style="@style/AntennaPod.TextView.Heading"/> <TextView @@ -20,15 +26,14 @@ android:text="@string/gpodnetauth_finish_descr" android:layout_below="@id/txtvTitle" android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorSecondary" - android:layout_margin="16dp"/> + android:textColor="?android:attr/textColorPrimary" /> <Button android:id="@+id/butSyncNow" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/txtvDescription" - android:layout_margin="16dp" + android:layout_marginTop="16dp" android:text="@string/gpodnetauth_finish_butsyncnow"/> <Button @@ -36,7 +41,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/butSyncNow" - android:layout_margin="16dp" android:text="@string/gpodnetauth_finish_butgomainscreen"/> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/xml/preferences_integrations.xml b/app/src/main/res/xml/preferences_integrations.xml index 716f6c476..7e16d44fb 100644 --- a/app/src/main/res/xml/preferences_integrations.xml +++ b/app/src/main/res/xml/preferences_integrations.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <Preference android:key="prefGpodderSettings" android:title="@string/gpodnet_main_label" + app:icon="@drawable/gpodder_icon" android:summary="@string/gpodnet_summary" /> </PreferenceScreen> |