Skip to content

X
xabber-android
Commit 2d5c2e87 authored by Grigory Fedorov's avatar Grigory Fedorov
Browse files
Options

Toolbar is used instead of action bar. Layout toolbar_default included in every activity's layout.

parent a83fa7d7
Hide whitespace changes
Inline Side-by-side
Showing with 400 additions and 268 deletions
app/src/main/java/com/xabber/android/ui/AccountAdd.java
View file @ 2d5c2e87
......@@ -18,6 +18,7 @@ import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
......@@ -96,6 +97,7 @@ public class AccountAdd extends ManagedActivity implements
inputManager.hideSoftInputFromWindow(findViewById(R.id.ok)
.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
......
app/src/main/java/com/xabber/android/ui/ChatViewer.java
View file @ 2d5c2e87
......@@ -22,6 +22,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
......@@ -128,6 +129,9 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
exitOnSend = savedInstanceState.getBoolean(SAVED_EXIT_ON_SEND);
}
setContentView(R.layout.activity_chat_viewer);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
contactTitleActionBarInflater = new ContactTitleActionBarInflater(this);
contactTitleActionBarInflater.setUpActionBarView();
......@@ -140,8 +144,6 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
contactTitleActionBarInflater.setOnAvatarClickListener(this);
setContentView(R.layout.activity_chat_viewer);
if (account != null && user != null) {
chatViewerAdapter = new ChatViewerAdapter(getFragmentManager(), account, user, this);
isChatSelected = true;
......
app/src/main/java/com/xabber/android/ui/ContactAdd.java
View file @ 2d5c2e87
......@@ -21,6 +21,7 @@ import java.util.HashSet;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.AdapterView;
......@@ -62,12 +63,15 @@ public class ContactAdd extends GroupListActivity implements
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
protected void onInflate(Bundle savedInstanceState) {
setContentView(R.layout.contact_add);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
ListView listView = getListView();
LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
......
app/src/main/java/com/xabber/android/ui/ContactEditor.java
View file @ 2d5c2e87
......@@ -17,6 +17,7 @@ package com.xabber.android.ui;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.widget.AdapterView;
import android.widget.EditText;
......@@ -45,16 +46,12 @@ public class ContactEditor extends GroupListActivity implements
ContactTitleActionBarInflater contactTitleActionBarInflater;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
protected void onInflate(Bundle savedInstanceState) {
setContentView(R.layout.contact_editor);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
contactTitleActionBarInflater = new ContactTitleActionBarInflater(this);
contactTitleActionBarInflater.setUpActionBarView();
}
@Override
protected void onInflate(Bundle savedInstanceState) {
setContentView(R.layout.contact_editor);
Intent intent = getIntent();
account = ContactEditor.getAccount(intent);
......
app/src/main/java/com/xabber/android/ui/ContactList.java
View file @ 2d5c2e87
......@@ -27,6 +27,7 @@ import android.os.Handler;
import android.support.v4.app.Fragment;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
......@@ -125,6 +126,7 @@ public class ContactList extends ManagedActivity implements OnAccountChangedList
}
setContentView(R.layout.contact_list);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
setTitle(getString(R.string.production_title));
......
app/src/main/java/com/xabber/android/ui/FingerprintViewer.java
View file @ 2d5c2e87
......@@ -21,6 +21,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.text.ClipboardManager;
import android.view.View;
import android.view.View.OnClickListener;
......@@ -92,6 +93,8 @@ public class FingerprintViewer extends ManagedActivity implements
}
setContentView(R.layout.fingerprint_viewer);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
integrator = new IntentIntegrator(this);
Intent intent = getIntent();
account = getAccount(intent);
......
app/src/main/java/com/xabber/android/ui/MUCEditor.java
View file @ 2d5c2e87
......@@ -21,6 +21,7 @@ import org.jivesoftware.smack.util.StringUtils;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
......@@ -71,6 +72,7 @@ public class MUCEditor extends ManagedActivity implements View.OnClickListener,
return;
setContentView(R.layout.muc_editor);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
......
app/src/main/java/com/xabber/android/ui/OccupantList.java
View file @ 2d5c2e87
......@@ -19,6 +19,7 @@ import java.util.Collection;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.data.Application;
import com.xabber.android.data.account.OnAccountChangedListener;
......@@ -59,6 +60,8 @@ public class OccupantList extends ManagedListActivity implements
return;
}
setContentView(R.layout.list);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
listAdapter = new OccupantListAdapter(this, account, room);
setListAdapter(listAdapter);
......
app/src/main/java/com/xabber/android/ui/QuestionViewer.java
View file @ 2d5c2e87
......@@ -17,6 +17,7 @@ package com.xabber.android.ui;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.EditText;
......@@ -88,6 +89,7 @@ public class QuestionViewer extends ManagedActivity implements
answerRequest = intent.getBooleanExtra(EXTRA_FIELD_ANSWER_REQUEST, false);
if (showQuestion) {
setContentView(R.layout.question_viewer);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
questionView = (EditText) findViewById(R.id.question);
questionView.setEnabled(!answerRequest);
if (answerRequest) {
......@@ -97,6 +99,7 @@ public class QuestionViewer extends ManagedActivity implements
}
} else {
setContentView(R.layout.secret_viewer);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
}
findViewById(R.id.cancel).setOnClickListener(this);
findViewById(R.id.send).setOnClickListener(this);
......
app/src/main/java/com/xabber/android/ui/StatusEditor.java
View file @ 2d5c2e87
......@@ -17,6 +17,7 @@ package com.xabber.android.ui;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
......@@ -68,6 +69,7 @@ public class StatusEditor extends ManagedListActivity implements
actionWithItem = null;
setContentView(R.layout.status_editor);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
......
app/src/main/java/com/xabber/android/ui/preferences/AboutViewer.java
View file @ 2d5c2e87
......@@ -20,6 +20,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.support.v4.app.NavUtils;
import android.support.v7.widget.Toolbar;
import android.text.method.LinkMovementMethod;
import android.view.MenuItem;
import android.widget.TextView;
......@@ -33,6 +34,7 @@ public class AboutViewer extends ManagedActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.about_viewer);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
((TextView) findViewById(R.id.about_version))
.setText(getString(R.string.about_version, getVersionName()));
......
app/src/main/java/com/xabber/android/ui/preferences/AccountEditor.java
View file @ 2d5c2e87
......@@ -20,6 +20,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.support.v7.widget.Toolbar;
import com.xabber.android.data.Application;
import com.xabber.android.data.account.AccountItem;
......@@ -71,9 +72,10 @@ public class AccountEditor extends ManagedActivity implements
token = savedInstanceState.getString(SAVED_TOKEN);
}
setTitle(AccountManager.getInstance().getVerboseName(account));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setTitle(AccountManager.getInstance().getVerboseName(account));
}
@Override
......
app/src/main/java/com/xabber/android/ui/preferences/AccountList.java
View file @ 2d5c2e87
......@@ -19,6 +19,7 @@ import java.util.Collection;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.ContextMenu;
import android.view.MenuItem;
......@@ -42,6 +43,7 @@ public class AccountList extends BaseListEditor<String> implements
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_accounts)));
......
app/src/main/java/com/xabber/android/ui/preferences/BaseListEditor.java
View file @ 2d5c2e87
......@@ -17,6 +17,7 @@ package com.xabber.android.ui.preferences;
import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.Menu;
......@@ -75,6 +76,7 @@ public abstract class BaseListEditor<T> extends ManagedListActivity implements
*/
protected void onInflate(Bundle savedInstanceState) {
setContentView(R.layout.list);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
}
protected abstract T getSavedValue(Bundle bundle, String key);
......
app/src/main/java/com/xabber/android/ui/preferences/BasePhrasePreferences.java
View file @ 2d5c2e87
......@@ -2,6 +2,7 @@ package com.xabber.android.ui.preferences;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.data.message.phrase.Phrase;
import com.xabber.android.ui.helper.ManagedActivity;
......@@ -16,9 +17,9 @@ public abstract class BasePhrasePreferences extends ManagedActivity
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
getFragmentManager().beginTransaction()
......
app/src/main/java/com/xabber/android/ui/preferences/ChatEditor.java
View file @ 2d5c2e87
......@@ -17,6 +17,7 @@ package com.xabber.android.ui.preferences;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.data.Application;
import com.xabber.android.data.account.AccountItem;
......@@ -47,6 +48,7 @@ public class ChatEditor extends ManagedActivity
}
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
......
app/src/main/java/com/xabber/android/ui/preferences/ChatSettings.java
View file @ 2d5c2e87
package com.xabber.android.ui.preferences;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
......@@ -15,6 +16,7 @@ public class ChatSettings extends ManagedActivity {
return;
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.chat_viewer)));
......
app/src/main/java/com/xabber/android/ui/preferences/ConnectionSettings.java
View file @ 2d5c2e87
package com.xabber.android.ui.preferences;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
......@@ -15,6 +16,7 @@ public class ConnectionSettings extends ManagedActivity {
return;
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_connection)));
......
app/src/main/java/com/xabber/android/ui/preferences/ContactListSettings.java
View file @ 2d5c2e87
package com.xabber.android.ui.preferences;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
......@@ -14,6 +15,7 @@ public class ContactListSettings extends ManagedActivity {
return;
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_contacts)));
......
app/src/main/java/com/xabber/android/ui/preferences/ContactViewer.java
View file @ 2d5c2e87
......@@ -18,6 +18,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.data.Application;
import com.xabber.android.data.LogManager;
......@@ -187,6 +188,8 @@ public class ContactViewer extends ManagedActivity implements
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
ContactTitleActionBarInflater contactTitleActionBarInflater = new ContactTitleActionBarInflater(this);
......
app/src/main/java/com/xabber/android/ui/preferences/DebugSettings.java
View file @ 2d5c2e87
package com.xabber.android.ui.preferences;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
......@@ -15,6 +16,7 @@ public class DebugSettings extends ManagedActivity {
return;
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_debug)));
......
app/src/main/java/com/xabber/android/ui/preferences/NotificationsSettings.java
View file @ 2d5c2e87
......@@ -2,6 +2,7 @@ package com.xabber.android.ui.preferences;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
......@@ -16,6 +17,7 @@ public class NotificationsSettings extends ManagedActivity {
return;
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_events)));
......
app/src/main/java/com/xabber/android/ui/preferences/PreferenceEditor.java
View file @ 2d5c2e87
......@@ -18,6 +18,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.data.SettingsManager;
import com.xabber.android.ui.helper.ManagedActivity;
......@@ -33,6 +34,7 @@ public class PreferenceEditor extends ManagedActivity
return;
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
if (savedInstanceState == null) {
getFragmentManager().beginTransaction()
......
app/src/main/java/com/xabber/android/ui/preferences/SecuritySettings.java
View file @ 2d5c2e87
package com.xabber.android.ui.preferences;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
......@@ -15,6 +16,7 @@ public class SecuritySettings extends ManagedActivity {
return;
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_security)));
......
app/src/main/java/com/xabber/android/ui/preferences/ThemeSettings.java
View file @ 2d5c2e87
package com.xabber.android.ui.preferences;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import com.xabber.android.data.ActivityManager;
import com.xabber.android.ui.ContactList;
......@@ -18,7 +19,7 @@ public class ThemeSettings extends ManagedActivity
return;
setContentView(R.layout.activity_preferences);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar_default));
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_interface)));
......
app/src/main/res/layout/about_viewer.xml
View file @ 2d5c2e87
......@@ -18,8 +18,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:padding="4dip"
>
<include layout="@layout/toolbar_default"/>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
......
app/src/main/res/layout/account_add.xml
View file @ 2d5c2e87
......@@ -22,6 +22,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/toolbar_default"/>
<TextView android:text="@string/account_type" android:layout_width="match_parent" android:layout_height="wrap_content" />
<Spinner
android:id="@+id/account_type"
......
app/src/main/res/layout/activity_chat_viewer.xml
View file @ 2d5c2e87
......@@ -4,19 +4,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<include layout="@layout/toolbar_default"
android:id="@+id/toolbar_default"
/>
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar_default"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:id="@+id/chat_scroll_indicator"
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:id="@+id/chat_scroll_indicator"
android:layout_below="@+id/toolbar_default"
>
</LinearLayout>
......
app/src/main/res/layout/activity_preferences.xml
View file @ 2d5c2e87
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/preferences_activity_container"
android:orientation="vertical"
>
</RelativeLayout>
\ No newline at end of file
<include layout="@layout/toolbar_default"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/preferences_activity_container"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/contact_add.xml
View file @ 2d5c2e87
......@@ -12,9 +12,20 @@
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<ListView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="4dip" />
android:orientation="vertical"
>
<include layout="@layout/toolbar_default" />
<ListView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="4dip" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/contact_editor.xml
View file @ 2d5c2e87
......@@ -19,6 +19,8 @@
android:layout_height="match_parent"
>
<include layout="@layout/toolbar_default"/>
<TextView
android:text="@string/contact_name"
android:layout_width="wrap_content"
......
app/src/main/res/layout/contact_list.xml
View file @ 2d5c2e87
......@@ -13,14 +13,17 @@
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/toolbar_default" />
<RelativeLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@android:id/title" />
/>
</RelativeLayout>
</LinearLayout>
app/src/main/res/layout/contact_list_fragment.xml
View file @ 2d5c2e87
......@@ -18,6 +18,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
......
app/src/main/res/layout/fingerprint_viewer.xml
View file @ 2d5c2e87
......@@ -19,92 +19,94 @@
android:layout_height="match_parent"
>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dip"
android:paddingBottom="4dip"
android:paddingLeft="2dip"
android:paddingRight="2dip"
>
<TextView
android:text="@string/otr_fingerprint_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dip"
/>
<TextView
android:text="@string/otr_remote_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/otr_remote_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@android:style/TextAppearance.Large"
android:text="12:34:56"
/>
<CheckBox
android:id="@+id/verified"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/otr_is_verified"
/>
<Button
android:id="@+id/scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/otr_scan_fingerprint"
/>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/divider_horizontal_dark"
/>
<TextView
android:text="@string/otr_local_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/otr_local_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@android:style/TextAppearance.Large"
android:text="12:34:56"
/>
<Button
android:id="@+id/show"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/otr_show_fingerprint"
/>
<Button
android:id="@+id/copy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/otr_copy_fingerprint"
/>
</LinearLayout>
</ScrollView>
<include layout="@layout/toolbar_default"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dip"
android:paddingBottom="4dip"
android:paddingLeft="2dip"
android:paddingRight="2dip"
>
<TextView
android:text="@string/otr_fingerprint_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dip"
/>
<TextView
android:text="@string/otr_remote_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/otr_remote_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@android:style/TextAppearance.Large"
android:text="12:34:56"
/>
<CheckBox
android:id="@+id/verified"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/otr_is_verified"
/>
<Button
android:id="@+id/scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/otr_scan_fingerprint"
/>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/divider_horizontal_dark"
/>
<TextView
android:text="@string/otr_local_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/otr_local_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@android:style/TextAppearance.Large"
android:text="12:34:56"
/>
<Button
android:id="@+id/show"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/otr_show_fingerprint"
/>
<Button
android:id="@+id/copy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/otr_copy_fingerprint"
/>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/list.xml
View file @ 2d5c2e87
......@@ -12,9 +12,20 @@
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<ListView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:orientation="vertical"
>
<include layout="@layout/toolbar_default"/>
<ListView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/muc_editor.xml
View file @ 2d5c2e87
......@@ -25,6 +25,8 @@
android:layout_height="match_parent"
>
<include layout="@layout/toolbar_default"/>
<TextView
android:text="@string/contact_account"
android:layout_width="wrap_content"
......
app/src/main/res/layout/question_viewer.xml
View file @ 2d5c2e87
......@@ -19,79 +19,81 @@
android:layout_height="match_parent"
>
<ScrollView
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dip"
android:paddingBottom="4dip"
android:paddingLeft="2dip"
android:paddingRight="2dip"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<TextView
android:text="@string/otr_question_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dip"
/>
<TextView
android:text="@string/otr_question"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/question"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView
android:text="@string/otr_answer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/answer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<Button
android:id="@+id/send"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/chat_send"
/>
<Button
android:id="@+id/cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/cancel"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
<include layout="@layout/toolbar_default"/>
<ScrollView
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dip"
android:paddingBottom="4dip"
android:paddingLeft="2dip"
android:paddingRight="2dip"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<TextView
android:text="@string/otr_question_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dip"
/>
<TextView
android:text="@string/otr_question"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/question"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView
android:text="@string/otr_answer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/answer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<Button
android:id="@+id/send"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/chat_send"
/>
<Button
android:id="@+id/cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/cancel"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/secret_viewer.xml
View file @ 2d5c2e87
......@@ -19,67 +19,69 @@
android:layout_height="match_parent"
>
<ScrollView
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dip"
android:paddingBottom="4dip"
android:paddingLeft="2dip"
android:paddingRight="2dip"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<TextView
android:text="@string/otr_secret_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dip"
/>
<TextView
android:text="@string/otr_secret"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/answer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<Button
android:id="@+id/send"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/chat_send"
/>
<Button
android:id="@+id/cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/cancel"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
<include layout="@layout/toolbar_default"/>
<ScrollView
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dip"
android:paddingBottom="4dip"
android:paddingLeft="2dip"
android:paddingRight="2dip"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<TextView
android:text="@string/otr_secret_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dip"
/>
<TextView
android:text="@string/otr_secret"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/answer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<Button
android:id="@+id/send"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/chat_send"
/>
<Button
android:id="@+id/cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/cancel"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/status_editor.xml
View file @ 2d5c2e87
......@@ -12,9 +12,20 @@
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<ListView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="4dip" />
>
<include layout="@layout/toolbar_default"/>
<ListView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="4dip" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/toolbar_default.xml 0 → 100644
View file @ 2d5c2e87
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar_default"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:minHeight="?attr/actionBarSize"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
android:background="@color/background_material_dark"
android:elevation="8dp"
tools:showIn="@layout/contact_list" />
app/src/main/res/values/theme.xml
View file @ 2d5c2e87
......@@ -17,5 +17,6 @@
<item name="expanderGroupColor">?android:attr/textColorPrimary</item>
<item name="expanderAccountColor">?android:attr/textColorPrimaryInverse</item>
<item name="expanderIndicator">@drawable/expander_indicator_dark</item>
<item name="windowActionBar">false</item>
</style>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023