aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMultiRedditDetailActivity.java108
-rw-r--r--app/src/main/res/layout/activity_view_multi_reddit_detail.xml83
2 files changed, 44 insertions, 147 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMultiRedditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMultiRedditDetailActivity.java
index e450cf6e..37bc8cdb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMultiRedditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMultiRedditDetailActivity.java
@@ -12,7 +12,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
-import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
@@ -20,19 +19,14 @@ import androidx.appcompat.widget.Toolbar;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.fragment.app.Fragment;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.RequestManager;
-import com.bumptech.glide.request.RequestOptions;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;
-import com.google.android.material.chip.Chip;
import javax.inject.Inject;
import javax.inject.Named;
import butterknife.BindView;
import butterknife.ButterKnife;
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
import ml.docilealligator.infinityforreddit.AppBarStateChangeListener;
import ml.docilealligator.infinityforreddit.AsyncTask.GetCurrentAccountAsyncTask;
import ml.docilealligator.infinityforreddit.Fragment.PostFragment;
@@ -48,7 +42,6 @@ import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
import ml.docilealligator.infinityforreddit.SortType;
import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback;
import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
-import pl.droidsonroids.gif.GifImageView;
import retrofit2.Retrofit;
public class ViewMultiRedditDetailActivity extends BaseActivity implements SortTypeSelectionCallback,
@@ -64,24 +57,12 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
@BindView(R.id.coordinator_layout_view_multi_reddit_detail_activity)
CoordinatorLayout coordinatorLayout;
- @BindView(R.id.appbar_layout_view_multi_reddit_detail)
+ @BindView(R.id.appbar_layout_view_multi_reddit_detail_activity)
AppBarLayout appBarLayout;
@BindView(R.id.collapsing_toolbar_layout_view_multi_reddit_detail_activity)
CollapsingToolbarLayout collapsingToolbarLayout;
- @BindView(R.id.toolbar)
+ @BindView(R.id.toolbar_view_multi_reddit_detail_activity)
Toolbar toolbar;
- @BindView(R.id.icon_gif_image_view_view_multi_reddit_detail_activity)
- GifImageView iconGifImageView;
- @BindView(R.id.duplicate_multi_reddit_chip_view_multi_reddit_detail_activity)
- Chip duplicateSubredditChip;
- @BindView(R.id.multi_reddit_name_text_view_view_multi_reddit_detail_activity)
- TextView multiRedditNameTextView;
- @BindView(R.id.owner_text_view_view_multi_reddit_detail_activity)
- TextView ownerTextView;
- @BindView(R.id.subreddits_count_view_multi_reddit_detail_activity)
- TextView subredditsCountTextView;
- @BindView(R.id.description_text_view_view_multi_reddit_detail_activity)
- TextView descriptionTextView;
@Inject
@Named("no_oauth")
Retrofit mRetrofit;
@@ -97,8 +78,6 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
private String mAccountName;
private String multiPath;
private boolean isInLazyMode = false;
- private boolean showToast = false;
- private RequestManager glide;
private Fragment mFragment;
private Menu mMenu;
private AppBarLayout.LayoutParams params;
@@ -114,40 +93,45 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
ButterKnife.bind(this);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
- Resources resources = getResources();
+ Resources resources = getResources();
- if ((resources.getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT || resources.getBoolean(R.bool.isTablet))
- && mSharedPreferences.getBoolean(SharedPreferencesUtils.IMMERSIVE_INTERFACE_KEY, true)) {
- Window window = getWindow();
- window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
+ && (resources.getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT
+ || resources.getBoolean(R.bool.isTablet))
+ && mSharedPreferences.getBoolean(SharedPreferencesUtils.IMMERSIVE_INTERFACE_KEY, true)) {
+ Window window = getWindow();
+ window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
- boolean lightNavBar = false;
- if ((resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) {
- lightNavBar = true;
- }
- boolean finalLightNavBar = lightNavBar;
-
- View decorView = window.getDecorView();
- appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() {
- @Override
- public void onStateChanged(AppBarLayout appBarLayout, AppBarStateChangeListener.State state) {
- if (state == State.COLLAPSED) {
- if (finalLightNavBar) {
- decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
- }
- } else if (state == State.EXPANDED) {
- if (finalLightNavBar) {
- decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
- }
+ boolean lightNavBar = false;
+ if ((resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) {
+ lightNavBar = true;
+ }
+ boolean finalLightNavBar = lightNavBar;
+
+ View decorView = window.getDecorView();
+ if (finalLightNavBar) {
+ decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+ }
+ appBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() {
+ @Override
+ public void onStateChanged(AppBarLayout appBarLayout, State state) {
+ if (state == State.COLLAPSED) {
+ if (finalLightNavBar) {
+ decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+ }
+ } else if (state == State.EXPANDED) {
+ if (finalLightNavBar) {
+ decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
}
}
- });
-
- int navBarResourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
- if (navBarResourceId > 0) {
- showToast = true;
}
+ });
+
+ int statusBarResourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
+ if (statusBarResourceId > 0) {
+ ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar.getLayoutParams();
+ params.topMargin = getResources().getDimensionPixelSize(statusBarResourceId);
+ toolbar.setLayoutParams(params);
}
}
@@ -158,8 +142,10 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
return;
}
multiPath = multiReddit.getPath();
- multiRedditNameTextView.setText(multiReddit.getDisplayName());
- ownerTextView.setText(multiReddit.getOwner());
+
+ toolbar.setTitle(multiReddit.getDisplayName());
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState != null) {
mNullAccessToken = savedInstanceState.getBoolean(NULL_ACCESS_TOKEN_STATE);
@@ -194,20 +180,6 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
if (resourceId > 0) {
statusBarHeight = getResources().getDimensionPixelSize(resourceId);
}
-
- toolbar.setTitle(multiReddit.getDisplayName());
- ViewGroup.MarginLayoutParams toolbarParams = (ViewGroup.MarginLayoutParams) toolbar.getLayoutParams();
- toolbarParams.topMargin = statusBarHeight;
- toolbar.setLayoutParams(toolbarParams);
- setSupportActionBar(toolbar);
-
- glide = Glide.with(this);
-
- glide.load(multiReddit.getIconUrl())
- .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(144, 0)))
- .error(glide.load(R.drawable.subreddit_default_icon)
- .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(144, 0))))
- .into(iconGifImageView);
}
private void getCurrentAccountAndInitializeFragment() {
diff --git a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
index 797efe48..42567cc4 100644
--- a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml
@@ -9,7 +9,7 @@
tools:context=".Activity.ViewMultiRedditDetailActivity">
<com.google.android.material.appbar.AppBarLayout
- android:id="@+id/appbar_layout_view_multi_reddit_detail"
+ android:id="@+id/appbar_layout_view_multi_reddit_detail_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarAndTabBackgroundColor"
@@ -19,89 +19,14 @@
android:id="@+id/collapsing_toolbar_layout_view_multi_reddit_detail_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/backgroundColor"
+ app:layout_scrollFlags="scroll|enterAlways"
app:titleEnabled="false"
- app:contentScrim="?attr/colorPrimary"
- app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
- app:toolbarId="@+id/toolbar">
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <pl.droidsonroids.gif.GifImageView
- android:id="@+id/icon_gif_image_view_view_multi_reddit_detail_activity"
- android:layout_width="72dp"
- android:layout_height="72dp"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:elevation="4dp" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
- android:layout_below="@id/icon_gif_image_view_view_multi_reddit_detail_activity"
- android:background="?attr/backgroundColor">
-
- <TextView
- android:id="@+id/multi_reddit_name_text_view_view_multi_reddit_detail_activity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="16dp"
- android:textSize="?attr/font_18"
- android:textColor="@color/colorAccent"
- android:layout_gravity="center_horizontal"/>
-
- <com.google.android.material.chip.Chip
- android:id="@+id/duplicate_multi_reddit_chip_view_multi_reddit_detail_activity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@android:color/white"
- android:layout_gravity="center_horizontal"/>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <TextView
- android:id="@+id/owner_text_view_view_multi_reddit_detail_activity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/usernameColor"
- android:textSize="?attr/font_default"/>
-
- <TextView
- android:id="@+id/subreddits_count_view_multi_reddit_detail_activity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/primaryTextColor"
- android:textSize="?attr/font_default"/>
-
- </LinearLayout>
-
- <TextView
- android:id="@+id/description_text_view_view_multi_reddit_detail_activity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:textColor="@color/primaryTextColor"
- android:textSize="?attr/font_default"
- android:visibility="gone"/>
-
- </LinearLayout>
-
- </RelativeLayout>
+ app:toolbarId="@+id/toolbar_view_multi_reddit_detail_activity">
<androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar"
+ android:id="@+id/toolbar_view_multi_reddit_detail_activity"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- app:layout_collapseMode="pin"
- app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator" />
generated by cgit (git). Responsive design from responsive-cgit-css. Dark theme color palette from Dracula theme