Skip to content
Snippets Groups Projects
Commit a3363d99 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed several issues on KitKat and JellyBean, improved UI

parent 52255fc7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 268 additions and 189 deletions
app/build.gradle
+ 1
− 0
View file @ a3363d99
......@@ -175,6 +175,7 @@ dependencies {
compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') { transitive = true }
compile('com.github.afollestad.material-dialogs:commons:0.8.5.3@aar') { transitive = true }
compile 'com.afollestad:material-cab:0.1.12'
compile 'com.jenzz:materialpreference:1.3'
// ORM
apt "com.github.Raizlabs.DBFlow:dbflow-processor:3.1.1"
......
app/src/main/AndroidManifest.xml
+ 0
− 22
View file @ a3363d99
......@@ -49,154 +49,132 @@
<activity
android:name=".ui.chat.MainActivity"
android:label="@string/appName"
android:launchMode="singleTask"
android:parentActivityName=".ui.LoginActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.chat.ChannelDetailActivity"
android:label="@string/titleChannelDetails"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.chatlist.ChatListListActivity"
android:label="@string/titleEditChatLists"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.chatlist.ChatListEditActivity"
android:label="@string/titleEditChatList"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.chatlist.ChatListListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.chatlist.ChatListCreateActivity"
android:label="@string/titleCreateChatList"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.chatlist.ChatListListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.NetworkListActivity"
android:label="@string/titleEditNetworks"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.NetworkEditActivity"
android:label="@string/titleEditNetwork"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.network.NetworkListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.NetworkCreateActivity"
android:label="@string/titleCreateNetwork"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.network.NetworkListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.server.NetworkServerListActivity"
android:label="@string/titleEditNetworkServers"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.network.NetworkEditActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.identity.IdentityListActivity"
android:label="@string/titleEditIdentities"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.identity.IdentityEditActivity"
android:label="@string/titleEditIdentity"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.identity.IdentityListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.identity.IdentityCreateActivity"
android:label="@string/titleCreateIdentity"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.identity.IdentityListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.identity.nick.IdentityNickListActivity"
android:label="@string/titleEditNicks"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.identity.IdentityEditActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.server.NetworkServerEditActivity"
android:label="@string/titleEditNetworkServer"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.network.server.NetworkServerListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.ignore.IgnoreListActivity"
android:label="@string/titleEditIgnoreList"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.ignore.IgnoreRuleEditActivity"
android:label="@string/titleEditIgnoreRule"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.ignore.IgnoreListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.aliases.AliasListActivity"
android:label="@string/titleEditAliases"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.aliases.AliasEditActivity"
android:label="@string/titleEditAlias"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.aliases.AliasListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.setup.AccountSetupActivity"
android:label="@string/titleAccountSetup"
android:launchMode="singleTask"
android:parentActivityName=".ui.setup.AccountSelectActivity"
android:theme="@style/SetupTheme"/>
<activity
android:name=".ui.setup.AccountSelectActivity"
android:label="@string/titleAccountSelection"
android:launchMode="singleTask"
android:parentActivityName=".ui.LoginActivity"
android:theme="@style/SetupTheme"/>
<activity
android:name=".ui.setup.CoreSetupActivity"
android:label="@string/titleCoreSetup"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/SetupTheme"/>
<activity
android:name=".ui.settings.SettingsActivity"
android:label="@string/titleSettings"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
......
app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java
+ 14
− 10
View file @ a3363d99
......@@ -34,6 +34,8 @@ import de.kuschku.quasseldroid_ng.ui.setup.AccountSelectActivity;
import de.kuschku.quasseldroid_ng.ui.theme.AppContext;
public class LoginActivity extends AppCompatActivity {
public static final int REQUEST_CODE_SELECT = 8;
static {
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
}
......@@ -60,6 +62,7 @@ public class LoginActivity extends AppCompatActivity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_CODE_SELECT) {
if (resultCode == RESULT_OK) {
// If we select a different core than we used last time, clear the database
if (!context.settings().preferenceLastAccount.get().equals(data.getBundleExtra("extra").getString("account")))
......@@ -68,15 +71,16 @@ public class LoginActivity extends AppCompatActivity {
context.settings().preferenceLastAccount.set(data.getBundleExtra("extra").getString("account"));
checkReady();
firstStart = true;
} else if (context.settings().preferenceLastAccount.get().isEmpty()) {
} else {
finish();
}
}
}
private boolean checkReady() {
if (context.settings().preferenceLastAccount.get().isEmpty()) {
Intent intent = new Intent(this, AccountSelectActivity.class);
startActivityForResult(intent, 0);
startActivityForResult(intent, REQUEST_CODE_SELECT);
firstStart = true;
return true;
} else if (firstStart) {
......
app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/MainActivity.java
+ 23
− 0
View file @ a3363d99
......@@ -23,6 +23,7 @@ package de.kuschku.quasseldroid_ng.ui.chat;
import android.app.SearchManager;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
......@@ -42,6 +43,9 @@ import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.Toast;
......@@ -94,6 +98,7 @@ import de.kuschku.quasseldroid_ng.ui.coresettings.ignore.IgnoreListActivity;
import de.kuschku.quasseldroid_ng.ui.coresettings.network.NetworkListActivity;
import de.kuschku.quasseldroid_ng.ui.settings.SettingsActivity;
import de.kuschku.quasseldroid_ng.ui.setup.CoreSetupActivity;
import de.kuschku.util.CompatibilityUtils;
import de.kuschku.util.accounts.Account;
import de.kuschku.util.accounts.AccountManager;
import de.kuschku.util.annotationbind.AutoBinder;
......@@ -218,6 +223,24 @@ public class MainActivity extends BoundActivity {
nickList.setLayoutManager(new LinearLayoutManager(this));
nickList.setItemAnimator(new DefaultItemAnimator());
nickList.addItemDecoration(new DividerItemDecoration(this));
setStatusBar();
}
private void setStatusBar() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
Window window = getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
window.setStatusBarColor(getResources().getColor(android.R.color.transparent));
nickList.setPadding(0, CompatibilityUtils.getStatusBarHeight(this), 0, 0);
View viewById = findViewById(R.id.statusBarBackground);
ViewGroup.LayoutParams layoutParams = viewById.getLayoutParams();
layoutParams.height = CompatibilityUtils.getStatusBarHeight(this);
viewById.setLayoutParams(layoutParams);
}
}
@Override
......
app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/BufferViewHolder.java
+ 0
− 12
View file @ a3363d99
......@@ -21,8 +21,6 @@
package de.kuschku.quasseldroid_ng.ui.chat.drawer;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.StateListDrawable;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
......@@ -33,7 +31,6 @@ import android.widget.TextView;
import com.bignerdranch.expandablerecyclerview.ViewHolder.ChildViewHolder;
import com.google.common.base.Function;
import com.mikepenz.materialize.util.UIUtils;
import java.util.Locale;
......@@ -55,7 +52,6 @@ import de.kuschku.util.observables.lists.ObservableElement;
public class BufferViewHolder extends ChildViewHolder {
private final AppContext context;
private final StateListDrawable background;
public int id;
@Bind(R.id.material_drawer_icon)
ImageView icon;
......@@ -77,12 +73,6 @@ public class BufferViewHolder extends ChildViewHolder {
super(itemView);
ButterKnife.bind(this, itemView);
this.context = context;
background = new StateListDrawable();
background.addState(new int[]{android.R.attr.state_selected}, new ColorDrawable(context.themeUtil().res.colorSelected));
background.addState(new int[]{android.R.attr.state_checked}, new ColorDrawable(context.themeUtil().res.colorSelected));
background.addState(new int[]{android.R.attr.state_checked, android.R.attr.state_selected}, new ColorDrawable(context.themeUtil().res.colorSelected));
background.addState(new int[0], UIUtils.getSelectableBackground(itemView.getContext()));
}
@LayoutRes
......@@ -104,8 +94,6 @@ public class BufferViewHolder extends ChildViewHolder {
itemView.setOnClickListener(v -> listener.onClick(buffer));
itemView.setOnLongClickListener(v -> longClickListener.onLongClick(buffer));
itemView.setBackground(background);
id = buffer.getInfo().id;
BufferInfo.Type type = buffer.getInfo().type;
......
app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java
+ 12
− 0
View file @ a3363d99
......@@ -34,6 +34,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ScrollView;
import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.IItem;
......@@ -76,8 +77,12 @@ public class SlidingPanelHandler {
AppCompatEditText chatline;
@Bind(R.id.send)
AppCompatImageButton send;
@Bind(R.id.chatline_scroller)
ScrollView chatlineScroller;
private ItemAdapter<IItem> previousMessages;
private boolean expanded;
public SlidingPanelHandler(Activity activity, SlidingUpPanelLayout slidingLayout, AppContext context) {
this.slidingLayout = slidingLayout;
ButterKnife.bind(this, slidingLayout);
......@@ -90,6 +95,11 @@ public class SlidingPanelHandler {
setupHistoryFakeData();
bindListener();
chatlineScroller.setOnTouchListener((v, event) -> {
chatlineScroller.requestDisallowInterceptTouchEvent(expanded);
return true;
});
}
private void setupFormattingMenu(Activity activity) {
......@@ -254,6 +264,8 @@ public class SlidingPanelHandler {
chatline.getLayoutParams().height = themeUtil.res.actionBarSize;
}
chatline.setSingleLine(!expanded);
this.expanded = expanded;
chatlineScroller.setSmoothScrollingEnabled(false);
chatline.setSelection(selectionStart, selectionEnd);
}
......
app/src/main/java/de/kuschku/util/CompatibilityUtils.java
+ 10
− 0
View file @ a3363d99
......@@ -21,6 +21,7 @@
package de.kuschku.util;
import android.content.Context;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
......@@ -102,4 +103,13 @@ public class CompatibilityUtils {
}
return chars;
}
public static int getStatusBarHeight(Context context) {
int result = 0;
int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
if (resourceId > 0) {
result = context.getResources().getDimensionPixelSize(resourceId);
}
return result;
}
}
app/src/main/res/drawable/badge.xml
+ 5
− 5
View file @ a3363d99
......@@ -22,9 +22,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid/>
<padding
android:bottom="10dp"
android:left="10dp"
android:right="10dp"
android:top="10dp"/>
<corners android:radius="6dp"/>
android:bottom="4dp"
android:left="8dp"
android:right="8dp"
android:top="4dp"/>
<corners android:radius="16dp"/>
</shape>
app/src/main/res/layout/activity_main.xml
+ 16
− 5
View file @ a3363d99
......@@ -27,6 +27,7 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ui.chat.MainActivity">
<LinearLayout
......@@ -44,25 +45,30 @@
</LinearLayout>
<android.support.design.widget.NavigationView
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end">
android:layout_gravity="end"
android:fitsSystemWindows="true">
<android.support.v7.widget.RecyclerView
android:id="@+id/nickList"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:clipToPadding="false"
android:maxWidth="320dp"/>
</android.support.design.widget.NavigationView>
<android.support.design.widget.NavigationView
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start">
android:layout_gravity="start"
android:fitsSystemWindows="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:maxWidth="320dp"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
......@@ -72,6 +78,11 @@
android:layout_height="wrap_content"
android:theme="?attr/actionBarTheme">
<View
android:id="@+id/statusBarBackground"
android:layout_width="match_parent"
android:layout_height="0dip"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
......
app/src/main/res/layout/widget_buffer.xml
+ 78
− 68
View file @ a3363d99
......@@ -19,28 +19,36 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/material_drawer_item_secondary"
android:clickable="true"
android:orientation="horizontal"
android:paddingEnd="@dimen/material_drawer_vertical_padding"
android:paddingLeft="@dimen/material_drawer_vertical_padding"
android:paddingRight="@dimen/material_drawer_vertical_padding"
android:paddingStart="@dimen/material_drawer_vertical_padding">
<FrameLayout
android:layout_width="56dp"
android:layout_height="match_parent">
<ImageView
android:id="@+id/material_drawer_icon"
android:layout_width="@dimen/material_drawer_item_secondary_icon"
android:layout_height="@dimen/material_drawer_item_secondary"
android:layout_gravity="center_vertical"
android:paddingBottom="@dimen/material_drawer_item_secondary_icon_padding"
android:paddingEnd="@dimen/material_drawer_item_secondary_icon_padding_right"
android:paddingLeft="0dp"
android:paddingRight="@dimen/material_drawer_item_secondary_icon_padding_right"
android:paddingStart="0dp"
android:paddingTop="@dimen/material_drawer_item_secondary_icon_padding"/>
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical|start"
android:layout_marginBottom="@dimen/material_drawer_item_secondary_icon_padding"
android:layout_marginTop="@dimen/material_drawer_item_secondary_icon_padding"/>
</FrameLayout>
<LinearLayout
android:layout_width="0dp"
......@@ -101,3 +109,5 @@
</LinearLayout>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/widget_core_account.xml
+ 10
− 8
View file @ a3363d99
......@@ -20,7 +20,9 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/material_drawer_item_profile"
android:background="?attr/selectableItemBackground"
......@@ -70,6 +72,6 @@
android:layout_height="@dimen/material_drawer_item_profile_icon_width"
android:layout_gravity="center_vertical"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_delete"
android:tint="?attr/colorFill"/>
android:tint="?attr/colorFill"
app:srcCompat="@drawable/ic_delete"/>
</LinearLayout>
app/src/main/res/layout/widget_core_account_add.xml
+ 11
− 10
View file @ a3363d99
......@@ -20,7 +20,8 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/material_drawer_item_profile"
......
app/src/main/res/layout/widget_editor.xml
+ 12
− 11
View file @ a3363d99
......@@ -20,7 +20,8 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
......@@ -46,10 +47,10 @@
android:gravity="top"
android:hint="@string/labelPlaceholder"
android:inputType="textCapSentences|textShortMessage|textAutoCorrect"
android:paddingBottom="17dp"
android:paddingBottom="@dimen/chatlinePaddingVertical"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="17dp"
android:paddingTop="@dimen/chatlinePaddingVertical"
android:textColor="?attr/colorForeground"
android:textSize="16sp"/>
......@@ -58,7 +59,7 @@
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/send"
style="?attr/buttonStyleSmall"
android:layout_width="56dp"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
......@@ -67,9 +68,9 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="fitXY"
android:theme="@style/RippleOverlay"
android:tint="?attr/colorAccent"
app:srcCompat="@drawable/ic_send"/>
app:srcCompat="@drawable/ic_send"
app:theme="@style/RippleOverlay"/>
<android.support.design.widget.AppBarLayout
android:id="@+id/formatting_toolbar_container"
......
app/src/main/res/layout/widget_identitynick.xml
+ 12
− 10
View file @ a3363d99
......@@ -20,7 +20,9 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?selectableItemBackground"
......@@ -34,8 +36,8 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_reorder"
android:tint="?attr/colorFill"/>
android:tint="?attr/colorFill"
app:srcCompat="@drawable/ic_reorder"/>
<TextView
android:id="@+id/text"
......
app/src/main/res/layout/widget_networkserver.xml
+ 12
− 10
View file @ a3363d99
......@@ -20,7 +20,9 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?selectableItemBackground"
......@@ -34,8 +36,8 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_lock"
android:tint="?colorFill"/>
android:tint="?colorFill"
app:srcCompat="@drawable/ic_lock"/>
<TextView
android:id="@+id/text"
......
app/src/main/res/layout/widget_nick.xml
+ 4
− 2
View file @ a3363d99
......@@ -33,7 +33,7 @@
<TextView
android:id="@+id/mode"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
......@@ -42,7 +42,9 @@
android:gravity="center"
android:minWidth="40dp"
android:textColor="?colorBackground"
tools:text="\@"/>
android:textStyle="bold"
tools:text="\@"
/>
<LinearLayout
android:layout_width="0dp"
......
app/src/main/res/layout/widget_slider.xml
+ 21
− 16
View file @ a3363d99
......@@ -20,7 +20,8 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.sothree.slidinguppanel.SlidingUpPanelLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/sliding_layout_history"
......@@ -74,7 +75,11 @@
android:id="@+id/msg_history"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</FrameLayout>
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
app/src/main/res/values-land/dimens.xml 0 → 100644
+ 25
− 0
View file @ a3363d99
<?xml version="1.0" encoding="utf-8"?>
<!--
~ QuasselDroid - Quassel client for Android
~ Copyright (C) 2016 Janne Koschinski
~ Copyright (C) 2016 Ken Børge Viktil
~ Copyright (C) 2016 Magnus Fjell
~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org>
~
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, either version 3 of the License, or (at your option)
~ any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<dimen name="chatlinePaddingVertical">13dp</dimen>
</resources>
\ No newline at end of file
app/src/main/res/values-sw600dp/dimens.xml
+ 1
− 0
View file @ a3363d99
......@@ -22,4 +22,5 @@
<resources>
<dimen name="action_bar_default_padding_start_material">8dp</dimen>
<dimen name="chatlinePaddingVertical">17dp</dimen>
</resources>
app/src/main/res/values/dimens.xml
+ 1
− 0
View file @ a3363d99
......@@ -28,4 +28,5 @@
<dimen name="message_vertical">2dp</dimen>
<dimen name="action_bar_default_padding_start_material">0dp</dimen>
<dimen name="chatlinePaddingVertical">17dp</dimen>
</resources>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment