diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_view_imgur_media.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_view_imgur_gif.xml | 38 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_view_imgur_images.xml | 38 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_view_imgur_video.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/menu/view_imgur_image_fragments.xml | 17 | ||||
| -rw-r--r-- | app/src/main/res/menu/view_imgur_video_fragment.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/values-w820dp/dimens.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 26 |
10 files changed, 165 insertions, 10 deletions
diff --git a/app/src/main/res/layout/activity_view_imgur_media.xml b/app/src/main/res/layout/activity_view_imgur_media.xml new file mode 100644 index 00000000..8b6fa101 --- /dev/null +++ b/app/src/main/res/layout/activity_view_imgur_media.xml @@ -0,0 +1,19 @@ +<?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"> + + <ProgressBar + android:id="@+id/progress_bar_view_imgur_media_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" /> + + <androidx.viewpager.widget.ViewPager + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/view_pager_view_imgur_media_activity" + tools:context=".Activity.ViewImgurMediaActivity" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_view_imgur_gif.xml b/app/src/main/res/layout/fragment_view_imgur_gif.xml new file mode 100644 index 00000000..4a0697f4 --- /dev/null +++ b/app/src/main/res/layout/fragment_view_imgur_gif.xml @@ -0,0 +1,38 @@ +<?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:id="@+id/constraintLayout" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragment.ViewImgurImageFragment"> + + <ProgressBar + android:id="@+id/progress_bar_view_imgur_gif_fragment" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" /> + + <pl.droidsonroids.gif.GifImageView + android:id="@+id/image_view_view_imgur_gif_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <LinearLayout + android:id="@+id/load_image_error_linear_layout_view_imgur_gif_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawableTop="@drawable/ic_error_outline_white_24dp" + android:layout_gravity="center" + android:gravity="center" + android:textColor="@android:color/white" + android:text="@string/error_loading_gif_tap_to_retry" + android:textSize="?attr/font_default" /> + + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_view_imgur_images.xml b/app/src/main/res/layout/fragment_view_imgur_images.xml new file mode 100644 index 00000000..9d2ae408 --- /dev/null +++ b/app/src/main/res/layout/fragment_view_imgur_images.xml @@ -0,0 +1,38 @@ +<?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:id="@+id/constraintLayout" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Fragment.ViewImgurImageFragment"> + + <ProgressBar + android:id="@+id/progress_bar_view_imgur_image_fragment" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" /> + + <com.alexvasilkov.gestures.views.GestureImageView + android:id="@+id/image_view_view_imgur_image_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <LinearLayout + android:id="@+id/load_image_error_linear_layout_view_imgur_image_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawableTop="@drawable/ic_error_outline_white_24dp" + android:layout_gravity="center" + android:gravity="center" + android:textColor="@android:color/white" + android:text="@string/error_loading_image_tap_to_retry" + android:textSize="?attr/font_default" /> + + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_view_imgur_video.xml b/app/src/main/res/layout/fragment_view_imgur_video.xml new file mode 100644 index 00000000..2947d11f --- /dev/null +++ b/app/src/main/res/layout/fragment_view_imgur_video.xml @@ -0,0 +1,15 @@ +<?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" + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:context=".Fragment.ViewImgurVideoFragment"> + + <com.google.android.exoplayer2.ui.PlayerView + android:id="@+id/player_view_view_imgur_video_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:controller_layout_id="@layout/exo_playback_control_view"/> + +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/view_imgur_image_fragments.xml b/app/src/main/res/menu/view_imgur_image_fragments.xml new file mode 100644 index 00000000..806e91f5 --- /dev/null +++ b/app/src/main/res/menu/view_imgur_image_fragments.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/action_download_view_imgur_image_fragments" + android:orderInCategory="1" + android:title="@string/action_download" + android:icon="@drawable/ic_file_download_toolbar_white_24dp" + app:showAsAction="ifRoom" /> + + <item + android:id="@+id/action_share_view_imgur_image_fragments" + android:orderInCategory="2" + android:title="@string/action_share" + android:icon="@drawable/ic_share_toolbar_white_24dp" + app:showAsAction="ifRoom" /> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/view_imgur_video_fragment.xml b/app/src/main/res/menu/view_imgur_video_fragment.xml new file mode 100644 index 00000000..7b7c4fc8 --- /dev/null +++ b/app/src/main/res/menu/view_imgur_video_fragment.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/action_download_view_imgur_image_fragments" + android:orderInCategory="1" + android:title="@string/action_download" + android:icon="@drawable/ic_file_download_toolbar_white_24dp" + app:showAsAction="ifRoom" /> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 00000000..63fc8164 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ +<resources> + <!-- Example customization of dimensions originally defined in res/values/dimens.xml + (such as screen margins) for screens with more than 820dp of available width. This + would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). --> + <dimen name="activity_horizontal_margin">64dp</dimen> +</resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 30cce083..9b9cbf67 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -10,4 +10,6 @@ <dimen name="roundedBottomSheetCornerRadiusLeftPadding">0dp</dimen> <dimen name="roundedBottomSheetCornerRadiusRightPadding">0dp</dimen> <dimen name="staggeredLayoutManagerItemOffset">16dp</dimen> + <dimen name="appbar_padding">16dp</dimen> + <dimen name="appbar_padding_top">8dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8a695ffd..e4bf34b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -93,7 +93,7 @@ <string name="nsfw">NSFW</string> <string name="karma_info">Karma: %1$d</string> <string name="karma_info_user_detail">Karma:\n%1$d (%2$d + %3$d)</string> - <string name="cakeday_info">Cakeday:\n%1$s</string> + <string name="cakeday_info">Cake day:\n%1$s</string> <string name="since">Since:</string> <string name="profile">Profile</string> @@ -734,4 +734,6 @@ <string name="fetch_gfycat_video_failed">Fetch Gfycat video failed</string> <string name="fetching_video_info_please_wait">Fetching video info. Please wait.</string> + <string name="error_fetching_imgur_media">Cannot load images</string> + </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 47efff57..5634d70e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -50,20 +50,25 @@ <item name="tabBackground">?attr/selectableItemBackground</item> <item name="tabSelectedTextColor">@android:color/white</item> </style> - + <style name="MaterialAlertDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog"> <item name="android:textSize">?attr/font_default</item> <item name="android:background">?attr/cardViewBackgroundColor</item> - <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleTextStyle</item> + <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleTextStyle + </item> <item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialogBodyTextStyle</item> - <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle</item> - <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle</item> + <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle + </item> + <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle + </item> </style> <style name="CopyTextMaterialAlertDialogTheme"> <item name="android:textSize">?attr/font_default</item> - <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleTextStyle</item> - <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle</item> + <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleTextStyle + </item> + <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle + </item> </style> <style name="MaterialAlertDialogPositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog"> @@ -84,10 +89,13 @@ <style name="PreferenceActivityTheme" parent="AppTheme.NoActionBar"> <item name="android:textAppearanceListItem">@style/PreferenceTitleTextStyle</item> - <item name="android:textAppearanceListItemSecondary">@style/PreferenceSubtitleTextStyle</item> + <item name="android:textAppearanceListItemSecondary">@style/PreferenceSubtitleTextStyle + </item> <item name="android:textColorPrimary">?attr/primaryTextColor</item> - <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle</item> - <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle</item> + <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle + </item> + <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle + </item> <item name="alertDialogTheme">@style/ListPreferenceStyle</item> </style> |