Fix color for light theme
This commit is contained in:
parent
8a012024c8
commit
3c8303a158
|
@ -173,15 +173,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if( theme == Helper.THEME_LIGHT) {
|
|
||||||
about_code.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
about_thekinrar.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
about_trunk.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
about_translation.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
about_license.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
about_support.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
paypal.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
}
|
|
||||||
|
|
||||||
TextView about_website = findViewById(R.id.about_website);
|
TextView about_website = findViewById(R.id.about_website);
|
||||||
about_website.setOnClickListener(new View.OnClickListener() {
|
about_website.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
|
@ -206,9 +206,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
|
||||||
set_lock_account.setEnabled(false);
|
set_lock_account.setEnabled(false);
|
||||||
|
|
||||||
new RetrieveAccountInfoAsyncTask(getApplicationContext(), EditProfileActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
new RetrieveAccountInfoAsyncTask(getApplicationContext(), EditProfileActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
if( theme == Helper.THEME_LIGHT) {
|
|
||||||
set_profile_save.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -140,9 +140,6 @@ public class LoginActivity extends BaseActivity {
|
||||||
login_passwd = findViewById(R.id.login_passwd);
|
login_passwd = findViewById(R.id.login_passwd);
|
||||||
|
|
||||||
|
|
||||||
if (theme == Helper.THEME_LIGHT) {
|
|
||||||
connectionButton.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
}
|
|
||||||
login_instance.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
login_instance.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick (AdapterView<?> parent, View view, int position, long id) {
|
public void onItemClick (AdapterView<?> parent, View view, int position, long id) {
|
||||||
|
|
|
@ -122,9 +122,7 @@ public class RemoteFollowActivity extends BaseActivity implements OnRetrieveRemo
|
||||||
loader = findViewById(R.id.loader);
|
loader = findViewById(R.id.loader);
|
||||||
lv_account = findViewById(R.id.lv_account);
|
lv_account = findViewById(R.id.lv_account);
|
||||||
rf_no_result = findViewById(R.id.rf_no_result);
|
rf_no_result = findViewById(R.id.rf_no_result);
|
||||||
if( theme == Helper.THEME_LIGHT) {
|
|
||||||
rf_search.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
}
|
|
||||||
isLoadingInstance = false;
|
isLoadingInstance = false;
|
||||||
ActionBar actionBar = getSupportActionBar();
|
ActionBar actionBar = getSupportActionBar();
|
||||||
if( actionBar != null) {
|
if( actionBar != null) {
|
||||||
|
|
|
@ -656,9 +656,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
|
||||||
if( restored != -1 ){
|
if( restored != -1 ){
|
||||||
restoreToot(restored);
|
restoreToot(restored);
|
||||||
}
|
}
|
||||||
if( theme == Helper.THEME_LIGHT) {
|
|
||||||
toot_it.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -57,10 +57,10 @@ public class ConversationDecoration extends RecyclerView.ItemDecoration{
|
||||||
StatusListAdapter adapter = (StatusListAdapter) parent.getAdapter();
|
StatusListAdapter adapter = (StatusListAdapter) parent.getAdapter();
|
||||||
int position = parent.getChildAdapterPosition(child);
|
int position = parent.getChildAdapterPosition(child);
|
||||||
|
|
||||||
|
assert adapter != null;
|
||||||
Status status = adapter.getItem(position);
|
Status status = adapter.getItem(position);
|
||||||
|
|
||||||
int top = 0;
|
int top, bottom;
|
||||||
int bottom = 0;
|
|
||||||
if( status != null){
|
if( status != null){
|
||||||
Status statusBefore = null;
|
Status statusBefore = null;
|
||||||
if( position > 0)
|
if( position > 0)
|
||||||
|
@ -74,11 +74,12 @@ public class ConversationDecoration extends RecyclerView.ItemDecoration{
|
||||||
child.getBottom():child.getTop()+offSet;
|
child.getBottom():child.getTop()+offSet;
|
||||||
if( position == 0 && childCount > 1)
|
if( position == 0 && childCount > 1)
|
||||||
top = bottom - (int)Helper.convertDpToPixel(28, context);
|
top = bottom - (int)Helper.convertDpToPixel(28, context);
|
||||||
}
|
|
||||||
divider.setBounds(left, top, right, bottom);
|
divider.setBounds(left, top, right, bottom);
|
||||||
divider.draw(canvas);
|
divider.draw(canvas);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -570,6 +570,11 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
if( statuses != null && statuses.size() > 0)
|
if( statuses != null && statuses.size() > 0)
|
||||||
retrieveMissingToots(statuses.get(0).getId());
|
retrieveMissingToots(statuses.get(0).getId());
|
||||||
}
|
}
|
||||||
|
}else if (type == RetrieveFeedsAsyncTask.Type.DIRECT){
|
||||||
|
if( getUserVisibleHint() ){
|
||||||
|
if( statuses != null && statuses.size() > 0)
|
||||||
|
retrieveMissingToots(statuses.get(0).getId());
|
||||||
|
}
|
||||||
}else if (type == RetrieveFeedsAsyncTask.Type.HOME){
|
}else if (type == RetrieveFeedsAsyncTask.Type.HOME){
|
||||||
statusListAdapter.updateMuted(mutedAccount);
|
statusListAdapter.updateMuted(mutedAccount);
|
||||||
if( statuses != null && statuses.size() > 0)
|
if( statuses != null && statuses.size() > 0)
|
||||||
|
|
|
@ -65,7 +65,6 @@
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
style="@style/Base.Widget.AppCompat.Button.Colored"
|
style="@style/Base.Widget.AppCompat.Button.Colored"
|
||||||
android:tint="@android:color/white"
|
android:tint="@android:color/white"
|
||||||
android:textColor="@color/white"
|
|
||||||
android:text="@string/set_notif_sound"
|
android:text="@string/set_notif_sound"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content"/>
|
||||||
|
|
|
@ -91,7 +91,7 @@
|
||||||
<item name="android:background">@drawable/menu_selector</item>
|
<item name="android:background">@drawable/menu_selector</item>
|
||||||
</style>
|
</style>
|
||||||
<style name="ButtonColor" parent="Base.Widget.AppCompat.Button">
|
<style name="ButtonColor" parent="Base.Widget.AppCompat.Button">
|
||||||
<item name="android:textColor">@color/mastodonC4</item>
|
<item name="android:textColor">@color/white</item>
|
||||||
<item name="android:background">@drawable/button_selector</item>
|
<item name="android:background">@drawable/button_selector</item>
|
||||||
</style>
|
</style>
|
||||||
<style name="PopupMenu" parent="@android:style/Widget.PopupMenu">
|
<style name="PopupMenu" parent="@android:style/Widget.PopupMenu">
|
||||||
|
|
Loading…
Reference in New Issue