added option to disable toolbar overlap, layout fix, bug fix

Signed-off-by: nuclearfog <hatespirit666@gmail.com>

app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java

@@ -101,6 +101,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
         View user_card = findViewById(R.id.settings_data_card);
         CompoundButton toggleImg = findViewById(R.id.toggleImg);
         CompoundButton toggleAns = findViewById(R.id.toggleAns);
+        CompoundButton toolbarOverlap = findViewById(R.id.settings_toolbar_ov);
         SeekBar listSizeSelector = findViewById(R.id.settings_list_seek);
         Spinner fontSpinner = findViewById(R.id.spinner_font);
         enableProxy = findViewById(R.id.settings_enable_proxy);
@@ -159,6 +160,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
         toggleImg.setChecked(settings.getImageLoad());
         toggleAns.setChecked(settings.getAnswerLoad());
         enableAPI.setChecked(settings.isCustomApiSet());
+        toolbarOverlap.setChecked(settings.getToolbarOverlap());
         proxyAddr.setText(settings.getProxyHost());
         proxyPort.setText(settings.getProxyPort());
         proxyUser.setText(settings.getProxyUser());
@@ -192,6 +194,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
         enableProxy.setOnCheckedChangeListener(this);
         enableAuth.setOnCheckedChangeListener(this);
         hqImage.setOnCheckedChangeListener(this);
+        toolbarOverlap.setOnCheckedChangeListener(this);
         fontSpinner.setOnItemSelectedListener(this);
         listSizeSelector.setOnSeekBarChangeListener(this);
     }
@@ -381,6 +384,14 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
         else if (c.getId() == R.id.toggleAns) {
             settings.setAnswerLoad(checked);
         }
+        // enable high quality images
+        else if (c.getId() == R.id.settings_image_hq) {
+            settings.setHighQualityImage(checked);
+        }
+        // enable toolbar overlap
+        else if (c.getId() == R.id.settings_toolbar_ov) {
+            settings.setToolbarOverlap(checked);
+        }
         // enable proxy settings
         else if (c.getId() == R.id.settings_enable_proxy) {
             if (checked) {
@@ -400,10 +411,6 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
                 layout_auth.setVisibility(GONE);
             }
         }
-        // enable high quality images
-        else if (c.getId() == R.id.settings_image_hq) {
-            settings.setHighQualityImage(checked);
-        }
         // enable custom API setup
         else if (c.getId() == R.id.settings_set_custom_keys) {
             if (checked) {

app/src/main/java/org/nuclearfog/twidda/activity/MainActivity.java

@@ -81,7 +81,7 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.page_main);
-        Toolbar toolbar = findViewById(R.id.profile_toolbar);
+        Toolbar toolbar = findViewById(R.id.home_toolbar);
         pager = findViewById(R.id.home_pager);
         tablayout = findViewById(R.id.home_tab);
         root = findViewById(R.id.main_layout);

app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java

@@ -21,6 +21,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
@@ -80,7 +82,7 @@ public class ProfileEditor extends MediaActivity implements OnClickListener, OnP
         super.onCreate(savedInstanceState);
         setContentView(R.layout.page_editprofile);
         Toolbar toolbar = findViewById(R.id.editprofile_toolbar);
-        View root = findViewById(R.id.page_edit);
+        ConstraintLayout root = findViewById(R.id.page_edit);
         ImageView changeImageBtn = findViewById(R.id.profile_change_image_btn);
         profile_image = findViewById(R.id.edit_pb);
         profile_banner = findViewById(R.id.edit_banner);
@@ -91,14 +93,21 @@ public class ProfileEditor extends MediaActivity implements OnClickListener, OnP
         link = findViewById(R.id.edit_link);
         loc = findViewById(R.id.edit_location);
         bio = findViewById(R.id.edit_bio);
+
         loadingCircle = DialogBuilder.createProgress(this, this);
         closeDialog = DialogBuilder.create(this, PROFILE_EDITOR_LEAVE, this);
         errorDialog = DialogBuilder.create(this, PROFILE_EDITOR_ERROR, this);
-
         toolbar.setTitle(R.string.page_profile_edior);
         setSupportActionBar(toolbar);
 
         settings = GlobalSettings.getInstance(this);
+        if (!settings.getToolbarOverlap()) {
+            ConstraintSet constraints = new ConstraintSet();
+            constraints.clone(root);
+            constraints.connect(R.id.edit_banner, ConstraintSet.TOP, R.id.editprofile_toolbar, ConstraintSet.BOTTOM);
+            constraints.connect(R.id.edit_add_banner, ConstraintSet.TOP, R.id.edit_banner, ConstraintSet.TOP);
+            constraints.applyTo(root);
+        }
         toolbar.setBackgroundColor(settings.getBackgroundColor() & TOOLBAR_TRANSPARENCY);
         changeBannerBtn.setImageResource(R.drawable.add);
         changeImageBtn.setImageResource(R.drawable.add);
@@ -218,8 +227,11 @@ public class ProfileEditor extends MediaActivity implements OnClickListener, OnP
 
     @Override
     public void onSuccess() {
+        // set toolbar background
+        if (settings.getToolbarOverlap()) {
             AppStyles.setToolbarBackground(ProfileEditor.this, profile_banner, toolbar_background);
         }
+    }
 
 
     @Override

app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java

@@ -20,6 +20,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.tabs.TabLayout;
@@ -155,24 +157,31 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, O
     protected void onCreate(@Nullable Bundle b) {
         super.onCreate(b);
         setContentView(R.layout.page_profile);
-        toolbar = findViewById(R.id.profile_toolbar);
         View root = findViewById(R.id.user_view);
+        ConstraintLayout profileView = findViewById(R.id.profile_content);
+        toolbar = profileView.findViewById(R.id.profile_toolbar);
+        user_bio = profileView.findViewById(R.id.bio);
+        following = profileView.findViewById(R.id.following);
+        follower = profileView.findViewById(R.id.follower);
+        user_website = profileView.findViewById(R.id.links);
+        profileImage = profileView.findViewById(R.id.profile_img);
+        bannerImage = profileView.findViewById(R.id.profile_banner);
+        toolbarBackground = profileView.findViewById(R.id.profile_toolbar_background);
+        username = profileView.findViewById(R.id.profile_username);
+        screenName = profileView.findViewById(R.id.profile_screenname);
+        user_location = profileView.findViewById(R.id.location);
+        user_createdAt = profileView.findViewById(R.id.profile_date);
+        follow_back = profileView.findViewById(R.id.follow_back);
         tabLayout = findViewById(R.id.profile_tab);
-        user_bio = findViewById(R.id.bio);
-        following = findViewById(R.id.following);
-        follower = findViewById(R.id.follower);
-        user_website = findViewById(R.id.links);
-        profileImage = findViewById(R.id.profile_img);
-        bannerImage = findViewById(R.id.profile_banner);
-        toolbarBackground = findViewById(R.id.profile_toolbar_background);
-        username = findViewById(R.id.profile_username);
-        screenName = findViewById(R.id.profile_screenname);
-        user_location = findViewById(R.id.location);
-        user_createdAt = findViewById(R.id.profile_date);
-        follow_back = findViewById(R.id.follow_back);
         tabPages = findViewById(R.id.profile_pager);
 
         settings = GlobalSettings.getInstance(this);
+        if (!settings.getToolbarOverlap()) {
+            ConstraintSet constraints = new ConstraintSet();
+            constraints.clone(profileView);
+            constraints.connect(R.id.profile_banner, ConstraintSet.TOP, R.id.profile_toolbar, ConstraintSet.BOTTOM);
+            constraints.applyTo(profileView);
+        }
         following.setCompoundDrawablesWithIntrinsicBounds(R.drawable.following, 0, 0, 0);
         follower.setCompoundDrawablesWithIntrinsicBounds(R.drawable.follower, 0, 0, 0);
         user_createdAt.setCompoundDrawablesWithIntrinsicBounds(R.drawable.calendar, 0, 0, 0);
@@ -547,8 +556,10 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, O
     @Override
     public void onSuccess() {
         // setup toolbar background
+        if (settings.getToolbarOverlap()) {
             AppStyles.setToolbarBackground(UserProfile.this, bannerImage, toolbarBackground);
         }
+    }
 
 
     @Override

app/src/main/java/org/nuclearfog/twidda/adapter/FontAdapter.java

@@ -10,8 +10,6 @@ import android.widget.TextView;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
-import static android.util.TypedValue.COMPLEX_UNIT_SP;
-
 /**
  * Spinner Adapter for font settings
  *
@@ -20,11 +18,6 @@ import static android.util.TypedValue.COMPLEX_UNIT_SP;
  */
 public class FontAdapter extends BaseAdapter {
 
-    /**
-     * font size of an item
-     */
-    private static final float FONT_SIZE = 24.0f;
-
     /**
      * android system fonts
      */
@@ -73,7 +66,6 @@ public class FontAdapter extends BaseAdapter {
         textItem = view.findViewById(R.id.dropdown_textitem);
         textItem.setText(names[pos]);
         textItem.setTypeface(fonts[pos]);
-        textItem.setTextSize(COMPLEX_UNIT_SP, FONT_SIZE);
         textItem.setTextColor(settings.getFontColor());
         textItem.setBackgroundColor(settings.getCardColor());
         view.setBackgroundColor(settings.getBackgroundColor());

app/src/main/java/org/nuclearfog/twidda/adapter/LocationAdapter.java

@@ -16,8 +16,6 @@ import org.nuclearfog.twidda.database.GlobalSettings;
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.util.TypedValue.COMPLEX_UNIT_DIP;
-
 /**
  * Adapter class for Location selection spinner
  *
@@ -26,11 +24,6 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP;
  */
 public class LocationAdapter extends BaseAdapter {
 
-    /**
-     * text size of the items
-     */
-    private static final float TEXT_SIZE = 16.0f;
-
     private GlobalSettings settings;
     private List<TrendLocation> data = new ArrayList<>();
 
@@ -104,7 +97,6 @@ public class LocationAdapter extends BaseAdapter {
             view = inflater.inflate(R.layout.item_dropdown, parent, false);
         }
         textItem = view.findViewById(R.id.dropdown_textitem);
-        textItem.setTextSize(COMPLEX_UNIT_DIP, TEXT_SIZE);
         textItem.setBackgroundColor(settings.getCardColor());
         textItem.setTextColor(settings.getFontColor());
         textItem.setTypeface(settings.getTypeFace());

app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java

@@ -71,6 +71,7 @@ public class GlobalSettings {
     private static final String IMAGE_LOAD = "image_load";
     private static final String IMAGE_QUALITY = "image_hq";
     private static final String ANSWER_LOAD = "answer_load";
+    private static final String PROFILE_OVERLAP = "profile_toolbar_overlap";
     private static final String LOGGED_IN = "login";
     private static final String AUTH_KEY1 = "key1";
     private static final String AUTH_KEY2 = "key2";
@@ -116,7 +117,8 @@ public class GlobalSettings {
     private boolean loggedIn;
     private boolean isProxyEnabled;
     private boolean isProxyAuthSet;
-    private boolean isCustomAPIkeySet;
+    private boolean customAPIKey;
+    private boolean toolbarOverlap;
     private int indexFont;
     private int background_color;
     private int font_color;
@@ -310,6 +312,28 @@ public class GlobalSettings {
         edit.apply();
     }
 
+    /**
+     * is profile toolbar overlap enabled
+     *
+     * @return true if enabled
+     */
+    public boolean getToolbarOverlap() {
+        return toolbarOverlap;
+    }
+
+    /**
+     * set profile toolbar overlap
+     *
+     * @param enable true if toolbar should overlap profile banner
+     */
+    public void setToolbarOverlap(boolean enable) {
+        toolbarOverlap = enable;
+
+        Editor edit = settings.edit();
+        edit.putBoolean(PROFILE_OVERLAP, enable);
+        edit.apply();
+    }
+
     /**
      * sets image quality
      *
@@ -670,7 +694,7 @@ public class GlobalSettings {
      * @param key2 consumer key secret
      */
     public void setCustomAPI(String key1, String key2) {
-        isCustomAPIkeySet = true;
+        customAPIKey = true;
         this.api_key1 = key1;
         this.api_key2 = key2;
 
@@ -685,7 +709,7 @@ public class GlobalSettings {
      * remove all API keys
      */
     public void removeCustomAPI() {
-        isCustomAPIkeySet = false;
+        customAPIKey = false;
         this.api_key1 = "";
         this.api_key2 = "";
 
@@ -702,7 +726,7 @@ public class GlobalSettings {
      * @return true if custom API keys are set
      */
     public boolean isCustomApiSet() {
-        return isCustomAPIkeySet;
+        return customAPIKey;
     }
 
     /**
@@ -725,22 +749,23 @@ public class GlobalSettings {
         icon_color = settings.getInt(ICON_COLOR, DEFAULT_ICON_COLOR);
         indexFont = settings.getInt(INDEX_FONT, DEFAULT_FONT_INDEX);
         listSize = settings.getInt(LIST_SIZE, DEFAULT_LIST_SIZE);
+        isProxyEnabled = settings.getBoolean(PROXY_SET, false);
+        isProxyAuthSet = settings.getBoolean(AUTH_SET, false);
+        loggedIn = settings.getBoolean(LOGGED_IN, false);
         loadImage = settings.getBoolean(IMAGE_LOAD, true);
         loadAnswer = settings.getBoolean(ANSWER_LOAD, false);
         hqImages = settings.getBoolean(IMAGE_QUALITY, false);
-        loggedIn = settings.getBoolean(LOGGED_IN, false);
+        toolbarOverlap = settings.getBoolean(PROFILE_OVERLAP, true);
-        isCustomAPIkeySet = settings.getBoolean(CUSTOM_CONSUMER_KEY_SET, false);
+        customAPIKey = settings.getBoolean(CUSTOM_CONSUMER_KEY_SET, false);
         api_key1 = settings.getString(CUSTOM_CONSUMER_KEY_1, "");
         api_key2 = settings.getString(CUSTOM_CONSUMER_KEY_2, "");
         auth_key1 = settings.getString(AUTH_KEY1, "");
         auth_key2 = settings.getString(AUTH_KEY2, "");
-        userId = settings.getLong(USER_ID, 0);
-        isProxyEnabled = settings.getBoolean(PROXY_SET, false);
-        isProxyAuthSet = settings.getBoolean(AUTH_SET, false);
         proxyHost = settings.getString(PROXY_ADDR, "");
         proxyPort = settings.getString(PROXY_PORT, "");
         proxyUser = settings.getString(PROXY_USER, "");
         proxyPass = settings.getString(PROXY_PASS, "");
+        userId = settings.getLong(USER_ID, 0);
         String place = settings.getString(TREND_LOC, DEFAULT_LOCATION_NAME);
         int woeId = settings.getInt(TREND_ID, DEFAULT_LOCATION_WOEID);
         location = new TrendLocation(place, woeId);

app/src/main/res/layout/item_dropdown.xml

@@ -7,6 +7,8 @@
         android:id="@+id/dropdown_textitem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/dropdown_padding" />
+        android:textSize="@dimen/dropdown_text_size"
+        android:padding="@dimen/dropdown_padding"
+        android:maxLines="2" />
 
 </LinearLayout>

app/src/main/res/layout/page_main.xml

@@ -7,7 +7,7 @@
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
-        android:id="@+id/profile_toolbar"
+        android:id="@+id/home_toolbar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/mainpage_toolbar_height" />
 

app/src/main/res/layout/page_profile.xml

@@ -18,6 +18,7 @@
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/profile_content"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 

app/src/main/res/layout/page_settings.xml

@@ -187,20 +187,61 @@
                     android:padding="@dimen/settings_layout_padding">
 
                     <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:text="@string/settings_look"
+                        android:textSize="@dimen/settings_textsize" />
+
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/settins_font"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
                             android:singleLine="true"
-                        android:textSize="@dimen/settings_textsize" />
+                            android:text="@string/settins_font"
+                            android:textSize="@dimen/settings_textsize_small" />
 
                         <Spinner
                             android:id="@+id/spinner_font"
-                        android:layout_width="@dimen/settings_spinner_font_width"
+                            android:layout_width="0dp"
-                        android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/settings_spinner_margin"
+                            android:layout_marginLeft="@dimen/settings_spinner_margin"
+                            android:layout_weight="1"
                             android:popupBackground="@android:color/transparent" />
 
                     </LinearLayout>
 
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <com.kyleduo.switchbutton.SwitchButton
+                            android:id="@+id/settings_toolbar_ov"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="@dimen/settings_switch_margin"
+                            android:layout_marginRight="@dimen/settings_switch_margin" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:singleLine="true"
+                            android:text="@string/settings_enable_toolbar_overlap"
+                            android:textSize="@dimen/settings_textsize_small" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
@@ -217,13 +258,15 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/data_consumption"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:singleLine="true"
+                        android:text="@string/data_consumption"
                         android:textSize="@dimen/settings_textsize" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
@@ -231,7 +274,8 @@
                             android:id="@+id/toggleImg"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/settings_switch_margin" />
+                            android:layout_marginEnd="@dimen/settings_switch_margin"
+                            android:layout_marginRight="@dimen/settings_switch_margin" />
 
                         <TextView
                             android:layout_width="0dp"
@@ -245,7 +289,10 @@
                             android:id="@+id/settings_image_hq"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/settings_switch_margin" />
+                            android:layout_marginStart="@dimen/settings_switch_margin"
+                            android:layout_marginLeft="@dimen/settings_switch_margin"
+                            android:layout_marginEnd="@dimen/settings_switch_margin"
+                            android:layout_marginRight="@dimen/settings_switch_margin" />
 
                         <TextView
                             android:layout_width="0dp"
@@ -260,6 +307,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
@@ -267,14 +315,14 @@
                             android:id="@+id/toggleAns"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/settings_switch_margin" />
+                            android:layout_marginEnd="@dimen/settings_switch_margin"
+                            android:layout_marginRight="@dimen/settings_switch_margin" />
 
                         <TextView
-                            android:layout_width="0dp"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_weight="2"
-                            android:text="@string/settings_enable_ans_load"
                             android:singleLine="true"
+                            android:text="@string/settings_enable_ans_load"
                             android:textSize="@dimen/settings_textsize_small" />
 
                     </LinearLayout>
@@ -406,13 +454,15 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/settings_connections"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:singleLine="true"
+                        android:text="@string/settings_connections"
                         android:textSize="@dimen/settings_textsize" />
 
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
@@ -420,7 +470,8 @@
                             android:id="@+id/settings_enable_proxy"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/settings_switch_margin" />
+                            android:layout_marginEnd="@dimen/settings_switch_margin"
+                            android:layout_marginRight="@dimen/settings_switch_margin" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -435,6 +486,7 @@
                         android:id="@+id/settings_layout_proxy"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:orientation="horizontal">
 
                         <EditText
@@ -468,6 +520,7 @@
                         android:id="@+id/settings_layout_auth_enable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
@@ -475,7 +528,8 @@
                             android:id="@+id/settings_enable_auth"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/settings_switch_margin" />
+                            android:layout_marginEnd="@dimen/settings_switch_margin"
+                            android:layout_marginRight="@dimen/settings_switch_margin" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -490,6 +544,7 @@
                         android:id="@+id/settings_layout_proxy_auth"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:orientation="horizontal">
 
                         <EditText
@@ -519,6 +574,7 @@
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/settings_column_margin"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
@@ -526,7 +582,8 @@
                             android:id="@+id/settings_set_custom_keys"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/settings_switch_margin" />
+                            android:layout_marginEnd="@dimen/settings_switch_margin"
+                            android:layout_marginRight="@dimen/settings_switch_margin" />
 
                         <TextView
                             android:layout_width="wrap_content"

app/src/main/res/values-de-rDE/strings.xml

@@ -194,4 +194,6 @@
     <string name="button_play_pause">Pause/Abspielen</string>
     <string name="button_share">Videolink teilen</string>
     <string name="info_cant_add_gif">GIF konnte nicht hinzugefügt werden!</string>
+    <string name="settings_look">Aussehen</string>
+    <string name="settings_enable_toolbar_overlap">Überlappe Profilbanner</string>
 </resources>

app/src/main/res/values/dimens.xml

@@ -16,8 +16,9 @@
     <dimen name="settings_button_height">30sp</dimen>
     <dimen name="settings_button_color_edge_thickness">1dp</dimen>
     <dimen name="settings_button_margin">5dp</dimen>
-    <dimen name="settings_switch_margin">5dp</dimen>
+    <dimen name="settings_switch_margin">10dp</dimen>
-    <dimen name="settings_spinner_font_width">250sp</dimen>
+    <dimen name="settings_spinner_margin">10dp</dimen>
+    <dimen name="settings_column_margin">5dp</dimen>
     <dimen name="settings_seek_number_width">30sp</dimen>
     <dimen name="settings_seek_margin">10dp</dimen>
 
@@ -147,6 +148,7 @@
 
     <!-- dimens of item_dropdown-->
     <dimen name="dropdown_padding">2dp</dimen>
+    <dimen name="dropdown_text_size">18sp</dimen>
 
     <!--dimens of page_media.xml-->
     <dimen name="mediapage_preview_margin">10dp</dimen>

app/src/main/res/values/strings.xml

@@ -212,4 +212,6 @@
     <string name="dialog_button_no">No</string>
     <string name="dialog_button_cancel">Cancel</string>
     <string name="dialog_button_ok">OK</string>
+    <string name="settings_enable_toolbar_overlap">overlap profile banner</string>
+    <string name="settings_look">Look</string>
 </resources>