Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix color for light theme

This commit is contained in:
stom79 2018-10-26 17:00:38 +02:00
parent 8a012024c8
commit 3c8303a158
9 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
View File

@ -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);
about_website.setOnClickListener(new View.OnClickListener() {

4
app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java
View File

@ -206,9 +206,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
set_lock_account.setEnabled(false);
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

3
app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
View File

@ -140,9 +140,6 @@ public class LoginActivity extends BaseActivity {
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() {
@Override
public void onItemClick (AdapterView<?> parent, View view, int position, long id) {

4
app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java
View File

@ -122,9 +122,7 @@ public class RemoteFollowActivity extends BaseActivity implements OnRetrieveRemo
loader = findViewById(R.id.loader);
lv_account = findViewById(R.id.lv_account);
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;
ActionBar actionBar = getSupportActionBar();
if( actionBar != null) {

4
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -656,9 +656,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
if( restored != -1 ){
restoreToot(restored);
}
if( theme == Helper.THEME_LIGHT) {
toot_it.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
}
}
@Override

9
app/src/main/java/fr/gouv/etalab/mastodon/drawers/ConversationDecoration.java
View File

@ -57,10 +57,10 @@ public class ConversationDecoration extends RecyclerView.ItemDecoration{
StatusListAdapter adapter = (StatusListAdapter) parent.getAdapter();
int position = parent.getChildAdapterPosition(child);
assert adapter != null;
Status status = adapter.getItem(position);
int top = 0;
int bottom = 0;
int top, bottom;
if( status != null){
Status statusBefore = null;
if( position > 0)
@ -74,9 +74,10 @@ public class ConversationDecoration extends RecyclerView.ItemDecoration{
child.getBottom():child.getTop()+offSet;
if( position == 0 && childCount > 1)
top = bottom - (int)Helper.convertDpToPixel(28, context);
divider.setBounds(left, top, right, bottom);
divider.draw(canvas);
}
divider.setBounds(left, top, right, bottom);
divider.draw(canvas);
}
}

5
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
View File

@ -570,6 +570,11 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
if( statuses != null && statuses.size() > 0)
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){
statusListAdapter.updateMuted(mutedAccount);
if( statuses != null && statuses.size() > 0)

1
app/src/main/res/layout/fragment_settings_notifications.xml
View File

@ -65,7 +65,6 @@
android:gravity="center"
style="@style/Base.Widget.AppCompat.Button.Colored"
android:tint="@android:color/white"
android:textColor="@color/white"
android:text="@string/set_notif_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

2
app/src/main/res/values/styles.xml
View File

@ -91,7 +91,7 @@
<item name="android:background">@drawable/menu_selector</item>
</style>
<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>
</style>
<style name="PopupMenu" parent="@android:style/Widget.PopupMenu">