layout fix

This commit is contained in:
NudeDude 2018-09-15 20:57:40 +02:00
parent 59ad7e4bec
commit 78a9b495d1
3 changed files with 298 additions and 285 deletions

2
.idea/misc.xml generated
View File

@ -25,7 +25,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View File

@ -16,10 +16,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:gravity="center_horizontal"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
@ -30,155 +27,164 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<android.support.v7.widget.CardView
android:layout_width="@dimen/profile_image"
android:layout_height="@dimen/profile_image">
<ImageView
android:id="@+id/profile_img"
android:layout_width="@dimen/profile_image"
android:layout_height="@dimen/profile_image"
android:layout_marginEnd="5dp"
android:contentDescription="@string/profile_image" />
</android.support.v7.widget.CardView>
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:orientation="vertical">
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<android.support.v7.widget.CardView
android:layout_width="@dimen/profile_image"
android:layout_height="@dimen/profile_image">
<ImageView
android:id="@+id/profile_img"
android:layout_width="@dimen/profile_image"
android:layout_height="@dimen/profile_image"
android:layout_marginEnd="5dp"
android:contentDescription="@string/profile_image" />
</android.support.v7.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:orientation="vertical">
<ImageView
android:id="@+id/profile_verify"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:contentDescription="@string/verify"
android:visibility="gone"
app:srcCompat="@drawable/verify" />
<TextView
android:id="@+id/profile_username"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:singleLine="true" />
android:orientation="horizontal">
</LinearLayout>
<ImageView
android:id="@+id/profile_verify"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:contentDescription="@string/verify"
android:visibility="gone"
app:srcCompat="@drawable/verify" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/profile_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:singleLine="true" />
<ImageView
android:id="@+id/profile_locked"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:contentDescription="@string/profile_locked"
android:visibility="gone"
app:srcCompat="@drawable/lock" />
</LinearLayout>
<TextView
android:id="@+id/profile_screenname"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:singleLine="true" />
android:orientation="horizontal">
</LinearLayout>
<ImageView
android:id="@+id/profile_locked"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:contentDescription="@string/profile_locked"
android:visibility="gone"
app:srcCompat="@drawable/lock" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal">
<TextView
android:id="@+id/profile_screenname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:singleLine="true" />
<ImageView
android:id="@+id/followback"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:background="@drawable/followback"
android:contentDescription="@string/followback"
android:visibility="gone" />
</LinearLayout>
<TextView
android:id="@+id/following"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="4dp"
android:drawableStart="@drawable/following"
android:visibility="invisible" />
android:layout_marginTop="2dp"
android:orientation="horizontal">
<TextView
android:id="@+id/follower"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="4dp"
android:drawableStart="@drawable/follower"
android:visibility="invisible" />
<ImageView
android:id="@+id/followback"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:background="@drawable/followback"
android:contentDescription="@string/followback"
android:visibility="gone" />
<TextView
android:id="@+id/following"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="4dp"
android:drawableStart="@drawable/following"
android:visibility="invisible" />
<TextView
android:id="@+id/follower"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="4dp"
android:drawableStart="@drawable/follower"
android:visibility="invisible" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/bio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:linksClickable="true" />
<TextView
android:id="@+id/location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:drawableStart="@drawable/location"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/links"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web"
android:drawablePadding="4dp"
android:drawableStart="@drawable/link"
android:linksClickable="true"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/profile_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:drawableStart="@drawable/calendar"
android:singleLine="true"
android:textSize="12sp"
android:visibility="invisible" />
</LinearLayout>
<TextView
android:id="@+id/bio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:linksClickable="true" />
<TextView
android:id="@+id/location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:drawableStart="@drawable/location"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/links"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web"
android:drawablePadding="4dp"
android:drawableStart="@drawable/link"
android:linksClickable="true"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/profile_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:drawableStart="@drawable/calendar"
android:singleLine="true"
android:textSize="12sp"
android:visibility="invisible" />
</LinearLayout>
</android.support.design.widget.CollapsingToolbarLayout>

View File

@ -3,183 +3,190 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar_setting"
android:layout_width="match_parent"
android:layout_height="@dimen/bar_wide" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/color_settings"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<Button
android:id="@+id/color_background"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_weight="1"
android:text="@string/background" />
<Button
android:id="@+id/color_font"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="@string/font"
android:textColor="@android:color/black" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<Button
android:id="@+id/color_tweet"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_weight="1"
android:text="@string/popup" />
<Button
android:id="@+id/highlight_color"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_weight="1"
android:text="@string/highlight" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/data_load"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<Button
android:id="@+id/load_dialog"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_weight="1"
android:text="@string/load_factor" />
<CheckBox
android:id="@+id/toggleImg"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:text="@string/image" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/trend_setting"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp">
<Spinner
android:id="@+id/woeid"
android:layout_width="0dp"
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:text="@string/color_settings"
android:textSize="18sp" />
<EditText
android:id="@+id/woe_id"
android:layout_width="0dp"
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:drawablePadding="4dp"
android:hint="@string/woeid"
android:inputType="number"
android:singleLine="true"
android:visibility="invisible" />
android:gravity="center_horizontal"
android:orientation="horizontal">
</LinearLayout>
<Button
android:id="@+id/color_background"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_weight="1"
android:text="@string/background" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/database"
android:textSize="18sp" />
<Button
android:id="@+id/color_font"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="@string/font"
android:textColor="@android:color/black" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:padding="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<Button
android:id="@+id/delete_db"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@android:color/holo_red_dark"
android:text="@string/delete_database" />
<Button
android:id="@+id/color_tweet"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_weight="1"
android:text="@string/popup" />
<Button
android:id="@+id/highlight_color"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_weight="1"
android:text="@string/highlight" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/data_load"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<Button
android:id="@+id/load_dialog"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_weight="1"
android:text="@string/load_factor" />
<CheckBox
android:id="@+id/toggleImg"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:text="@string/image" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/trend_setting"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp">
<Spinner
android:id="@+id/woeid"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<EditText
android:id="@+id/woe_id"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:drawablePadding="4dp"
android:hint="@string/woeid"
android:inputType="number"
android:singleLine="true"
android:visibility="invisible" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/database"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:padding="5dp">
<Button
android:id="@+id/delete_db"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@android:color/holo_red_dark"
android:text="@string/delete_database" />
</LinearLayout>
</LinearLayout>