mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2024-11-07 03:07:26 +01:00
Minor UI tweaks. Fix UI issues in dark theme. Fix settings activity title.
This commit is contained in:
parent
6a038573c3
commit
03c97e912e
@ -50,7 +50,7 @@
|
|||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".SettingsActivity"
|
android:name=".SettingsActivity"
|
||||||
android:label="@string/search_activity_label"
|
android:label="@string/settings_activity_label"
|
||||||
android:parentActivityName=".MainActivity"
|
android:parentActivityName=".MainActivity"
|
||||||
android:theme="@style/PreferenceActivityTheme" />
|
android:theme="@style/PreferenceActivityTheme" />
|
||||||
<activity
|
<activity
|
||||||
|
@ -176,7 +176,6 @@ public class MainActivity extends AppCompatActivity implements SortTypeBottomShe
|
|||||||
|
|
||||||
ButterKnife.bind(this);
|
ButterKnife.bind(this);
|
||||||
|
|
||||||
|
|
||||||
EventBus.getDefault().register(this);
|
EventBus.getDefault().register(this);
|
||||||
|
|
||||||
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
|
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
|
||||||
|
@ -381,6 +381,11 @@ public class ViewSubredditDetailActivity extends AppCompatActivity implements So
|
|||||||
}
|
}
|
||||||
|
|
||||||
subscribeSubredditChip.setOnClickListener(view -> {
|
subscribeSubredditChip.setOnClickListener(view -> {
|
||||||
|
if(mAccessToken == null) {
|
||||||
|
Toast.makeText(ViewSubredditDetailActivity.this, R.string.login_first, Toast.LENGTH_SHORT).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(subscriptionReady) {
|
if(subscriptionReady) {
|
||||||
subscriptionReady = false;
|
subscriptionReady = false;
|
||||||
if(subscribeSubredditChip.getText().equals(getResources().getString(R.string.subscribe))) {
|
if(subscribeSubredditChip.getText().equals(getResources().getString(R.string.subscribe))) {
|
||||||
|
@ -311,6 +311,11 @@ public class ViewUserDetailActivity extends AppCompatActivity implements UserThi
|
|||||||
if (userData.isCanBeFollowed()) {
|
if (userData.isCanBeFollowed()) {
|
||||||
subscribeUserChip.setVisibility(View.VISIBLE);
|
subscribeUserChip.setVisibility(View.VISIBLE);
|
||||||
subscribeUserChip.setOnClickListener(view -> {
|
subscribeUserChip.setOnClickListener(view -> {
|
||||||
|
if(mAccessToken == null) {
|
||||||
|
Toast.makeText(ViewUserDetailActivity.this, R.string.login_first, Toast.LENGTH_SHORT).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (subscriptionReady) {
|
if (subscriptionReady) {
|
||||||
subscriptionReady = false;
|
subscriptionReady = false;
|
||||||
if (subscribeUserChip.getText().equals(resources.getString(R.string.follow))) {
|
if (subscribeUserChip.getText().equals(resources.getString(R.string.follow))) {
|
||||||
|
@ -11,13 +11,6 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:theme="@style/AppTheme.AppBarOverlay">
|
android:theme="@style/AppTheme.AppBarOverlay">
|
||||||
|
|
||||||
<com.google.android.material.appbar.CollapsingToolbarLayout
|
|
||||||
android:id="@+id/collapsing_toolbar_layout_search_activity"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
app:titleEnabled="false"
|
|
||||||
app:toolbarId="@+id/toolbar">
|
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/toolbar_frame_layout_search_activity"
|
android:id="@+id/toolbar_frame_layout_search_activity"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -46,8 +39,6 @@
|
|||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
|
||||||
|
|
||||||
</com.google.android.material.appbar.AppBarLayout>
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
<androidx.core.widget.NestedScrollView
|
<androidx.core.widget.NestedScrollView
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
android:id="@+id/toolbar_search_result_activity"
|
android:id="@+id/toolbar_search_result_activity"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
android:background="?attr/colorPrimary"
|
|
||||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||||
|
|
||||||
<com.ferfalk.simplesearchview.SimpleSearchView
|
<com.ferfalk.simplesearchview.SimpleSearchView
|
||||||
@ -51,7 +50,7 @@
|
|||||||
android:id="@+id/tab_layout_search_result_activity"
|
android:id="@+id/tab_layout_search_result_activity"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/colorPrimary"
|
android:background="@color/greyTabBackgroundColor"
|
||||||
app:layout_scrollFlags="scroll|enterAlways"
|
app:layout_scrollFlags="scroll|enterAlways"
|
||||||
app:tabGravity="fill"
|
app:tabGravity="fill"
|
||||||
app:tabMode="fixed"
|
app:tabMode="fixed"
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
android:id="@+id/toolbar"
|
android:id="@+id/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
android:background="?attr/colorPrimary"
|
|
||||||
app:layout_collapseMode="pin"
|
app:layout_collapseMode="pin"
|
||||||
app:layout_scrollFlags="scroll|enterAlways"
|
app:layout_scrollFlags="scroll|enterAlways"
|
||||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||||
@ -37,7 +36,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="bottom"
|
android:layout_gravity="bottom"
|
||||||
android:background="@color/colorPrimary"
|
android:background="@color/greyTabBackgroundColor"
|
||||||
app:layout_scrollFlags="scroll|enterAlways"
|
app:layout_scrollFlags="scroll|enterAlways"
|
||||||
app:tabGravity="fill"
|
app:tabGravity="fill"
|
||||||
app:tabIndicatorColor="@android:color/white"
|
app:tabIndicatorColor="@android:color/white"
|
||||||
|
@ -4,8 +4,6 @@
|
|||||||
<color name="colorPrimaryDark">#121212</color>
|
<color name="colorPrimaryDark">#121212</color>
|
||||||
<color name="colorAccent">#FF4081</color>
|
<color name="colorAccent">#FF4081</color>
|
||||||
|
|
||||||
<color name="downvoted">#E91E63</color>
|
|
||||||
|
|
||||||
<color name="transparentActionBarAndExoPlayerControllerColor">#88000000</color>
|
<color name="transparentActionBarAndExoPlayerControllerColor">#88000000</color>
|
||||||
|
|
||||||
<color name="gold">#FFC107</color>
|
<color name="gold">#FFC107</color>
|
||||||
@ -55,4 +53,6 @@
|
|||||||
<color name="notificationIconColor">#1565C0</color>
|
<color name="notificationIconColor">#1565C0</color>
|
||||||
|
|
||||||
<color name="defaultTextColor">#B3FFFFFF</color>
|
<color name="defaultTextColor">#B3FFFFFF</color>
|
||||||
|
|
||||||
|
<color name="greyTabBackgroundColor">#282828</color>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -69,4 +69,6 @@
|
|||||||
<color name="commentVerticalBar5">#EE0220</color>
|
<color name="commentVerticalBar5">#EE0220</color>
|
||||||
<color name="commentVerticalBar6">#02EE6E</color>
|
<color name="commentVerticalBar6">#02EE6E</color>
|
||||||
<color name="commentVerticalBar7">#EE4602</color>
|
<color name="commentVerticalBar7">#EE4602</color>
|
||||||
|
|
||||||
|
<color name="greyTabBackgroundColor">@color/colorPrimary</color>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -78,6 +78,7 @@
|
|||||||
|
|
||||||
<style name="PreferenceTitleTextStyle">
|
<style name="PreferenceTitleTextStyle">
|
||||||
<item name="android:textSize">?attr/font_16</item>
|
<item name="android:textSize">?attr/font_16</item>
|
||||||
|
<item name="android:textColor">@color/primaryTextColor</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="PreferenceSubtitleTextStyle">
|
<style name="PreferenceSubtitleTextStyle">
|
||||||
|
Loading…
Reference in New Issue
Block a user