diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 14e9faf47..2a27a9af0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,11 +26,11 @@
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
index e5bfa0296..cd95d44b5 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
@@ -90,7 +90,7 @@ public class LoginActivity extends AppCompatActivity {
if( theme == Helper.THEME_DARK) {
changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC2);
}else {
- changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC4);
+ changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.mastodonC3);
}
final Button connectionButton = (Button) findViewById(R.id.login_button);
login_instance = (AutoCompleteTextView) findViewById(R.id.login_instance);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
index 643497735..613e63b24 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
@@ -83,7 +83,6 @@ import static fr.gouv.etalab.mastodon.helper.Helper.HOME_TIMELINE_INTENT;
import static fr.gouv.etalab.mastodon.helper.Helper.INTENT_ACTION;
import static fr.gouv.etalab.mastodon.helper.Helper.NOTIFICATION_INTENT;
import static fr.gouv.etalab.mastodon.helper.Helper.PREF_KEY_ID;
-import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
import static fr.gouv.etalab.mastodon.helper.Helper.changeUser;
import static fr.gouv.etalab.mastodon.helper.Helper.loadPPInActionBar;
import static fr.gouv.etalab.mastodon.helper.Helper.menuAccounts;
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java
index a457c2a32..6fe4a5fbb 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java
@@ -15,9 +15,7 @@ package fr.gouv.etalab.mastodon.activities;
* see . */
import android.app.Application;
import android.os.StrictMode;
-
import com.evernote.android.job.JobManager;
-
import fr.gouv.etalab.mastodon.jobs.ApplicationJob;
import fr.gouv.etalab.mastodon.jobs.HomeTimelineSyncJob;
import fr.gouv.etalab.mastodon.jobs.NotificationsSyncJob;
@@ -39,6 +37,5 @@ public class MainApplication extends Application{
HomeTimelineSyncJob.schedule(false);
StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
StrictMode.setVmPolicy(builder.build());
-
}
}
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index e487dc1b4..9b43853d2 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -1213,14 +1213,27 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
private void changeColor(){
- changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe,R.color.dark_text);
- changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_open,R.color.dark_text);
- changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_closed,R.color.dark_text);
- changeDrawableColor(TootActivity.this, R.drawable.ic_local_post_office,R.color.dark_text);
- changeDrawableColor(TootActivity.this, R.drawable.ic_action_camera,R.color.dark_text);
- changeDrawableColor(TootActivity.this, R.drawable.ic_skip_previous,R.color.dark_text);
- changeDrawableColor(TootActivity.this, R.drawable.ic_skip_next,R.color.dark_text);
- changeDrawableColor(TootActivity.this, R.drawable.ic_check,R.color.dark_text);
+ final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+ int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+ if( theme == Helper.THEME_DARK) {
+ changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_open, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_closed, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_local_post_office, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_action_camera, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_skip_previous, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_skip_next, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_check, R.color.dark_text);
+ }else {
+ changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_open, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_closed, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_local_post_office, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_action_camera, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_skip_previous, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_skip_next, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_check, R.color.white);
+ }
}
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 70300b17d..10341861e 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -293,7 +293,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
changeDrawableColor(context, R.drawable.ic_fav_black,R.color.black);
changeDrawableColor(context, R.drawable.ic_photo,R.color.black);
changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.black);
- changeDrawableColor(context, R.drawable.ic_translate,R.color.black);
+ changeDrawableColor(context, R.drawable.ic_translate,R.color.white);
style = R.style.AlertDialog;
}
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index 6eaa01bc5..42971e806 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -32,6 +32,7 @@ import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.support.v4.app.Fragment;
import android.support.v7.widget.SwitchCompat;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -70,6 +71,7 @@ public class SettingsFragment extends Fragment {
private static final int ACTIVITY_CHOOSE_FILE = 411;
private TextView set_folder;
private int style;
+ int count = 0;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -334,26 +336,26 @@ public class SettingsFragment extends Fragment {
int positionSpinner = (sharedpreferences.getInt(Helper.SET_TABS, Helper.THEME_TABS) - 1);
tabs_layout_spinner.setSelection(positionSpinner);
- tabs_layout_spinner.post(new Runnable() {
- public void run() {
- tabs_layout_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
- @Override
- public void onItemSelected(AdapterView> parent, View view, int position, long id) {
- SharedPreferences.Editor editor = sharedpreferences.edit();
- editor.putInt(Helper.SET_TABS, (position + 1));
- editor.apply();
- Helper.switchLayout(getActivity());
- getActivity().recreate();
- Intent intent = new Intent(context, MainActivity.class);
- intent.putExtra(INTENT_ACTION, CHANGE_THEME_INTENT);
- startActivity(intent);
- }
+ tabs_layout_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+ if( count > 0){
+ SharedPreferences.Editor editor = sharedpreferences.edit();
+ editor.putInt(Helper.SET_TABS, (position + 1));
+ editor.apply();
+ Helper.switchLayout(getActivity());
+ getActivity().recreate();
+ Intent intent = new Intent(context, MainActivity.class);
+ intent.putExtra(INTENT_ACTION, CHANGE_THEME_INTENT);
+ startActivity(intent);
+ }else {
+ count++;
+ }
+ }
- @Override
- public void onNothingSelected(AdapterView> parent) {
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
- }
- });
}
});
@@ -370,10 +372,10 @@ public class SettingsFragment extends Fragment {
changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_local_post_office,R.color.dark_text);
}else {
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.black);
- changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.black);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.black);
- changeDrawableColor(context, R.drawable.ic_local_post_office,R.color.black);
+ changeDrawableColor(context, R.drawable.ic_action_globe,R.color.white);
+ changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.white);
+ changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.white);
+ changeDrawableColor(context, R.drawable.ic_local_post_office,R.color.white);
}
}
diff --git a/app/src/main/res/drawable/button_selector.xml b/app/src/main/res/drawable/button_selector.xml
new file mode 100644
index 000000000..e0134a0fa
--- /dev/null
+++ b/app/src/main/res/drawable/button_selector.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/menu_selector.xml b/app/src/main/res/drawable/menu_selector.xml
index 52656ae33..527657ce3 100644
--- a/app/src/main/res/drawable/menu_selector.xml
+++ b/app/src/main/res/drawable/menu_selector.xml
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_border_bottom_settings.xml b/app/src/main/res/drawable/shape_border_bottom_settings.xml
index ba8e759b8..dad6a5503 100644
--- a/app/src/main/res/drawable/shape_border_bottom_settings.xml
+++ b/app/src/main/res/drawable/shape_border_bottom_settings.xml
@@ -12,7 +12,7 @@
+ android:color="@color/mastodonC3__" />
diff --git a/app/src/main/res/drawable/side_nav_bar_dark.xml b/app/src/main/res/drawable/side_nav_bar_dark.xml
index dc934009e..27d494b12 100644
--- a/app/src/main/res/drawable/side_nav_bar_dark.xml
+++ b/app/src/main/res/drawable/side_nav_bar_dark.xml
@@ -2,8 +2,8 @@
android:shape="rectangle">
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index c80316f7f..3cce119db 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -108,8 +108,8 @@
+ android:layout_width="50dp"
+ android:layout_height="50dp" />
+ android:layout_height="50dp" />