moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-17 14:25:12 -05:00
Code Issues Releases Wiki Activity

hover effect

Browse Source
This commit is contained in:
Daniel Gultsch 2014-03-01 11:05:40 +01:00
parent 7b1dd0d0ee
commit 2ab6cb0ada
10 changed files with 104 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gen/eu/siacs/conversations/R.java
View File

@ -26,23 +26,29 @@ public final class R {
public static final int activity_vertical_margin=0x7f070001; public static final int activity_vertical_margin=0x7f070001;
} }
public static final class drawable { public static final class drawable {
public static final int es_slidingpane_shadow=0x7f020000; public static final int blue=0x7f020000;
public static final int ic_action_add=0x7f020001; public static final int bluebackground=0x7f020001;
public static final int ic_action_add_person=0x7f020002; public static final int darkblue=0x7f020002;
public static final int ic_action_cancel_launchersize=0x7f020003; public static final int darkred=0x7f020003;
public static final int ic_action_delete=0x7f020004; public static final int es_slidingpane_shadow=0x7f020004;
public static final int ic_action_group=0x7f020005; public static final int ic_action_add=0x7f020005;
public static final int ic_action_person=0x7f020006; public static final int ic_action_add_person=0x7f020006;
public static final int ic_action_refresh=0x7f020007; public static final int ic_action_cancel_launchersize=0x7f020007;
public static final int ic_action_secure=0x7f020008; public static final int ic_action_delete=0x7f020008;
public static final int ic_action_send=0x7f020009; public static final int ic_action_group=0x7f020009;
public static final int ic_action_send_now=0x7f02000a; public static final int ic_action_person=0x7f02000a;
public static final int ic_action_unsecure=0x7f02000b; public static final int ic_action_refresh=0x7f02000b;
public static final int ic_launcher=0x7f02000c; public static final int ic_action_secure=0x7f02000c;
public static final int ic_profile=0x7f02000d; public static final int ic_action_send=0x7f02000d;
public static final int message_border=0x7f02000e; public static final int ic_action_send_now=0x7f02000e;
public static final int notification=0x7f02000f; public static final int ic_action_unsecure=0x7f02000f;
public static final int section_header=0x7f020010; public static final int ic_launcher=0x7f020010;
public static final int ic_profile=0x7f020011;
public static final int message_border=0x7f020012;
public static final int notification=0x7f020013;
public static final int red=0x7f020014;
public static final int redbackground=0x7f020015;
public static final int section_header=0x7f020016;
} }
public static final class id { public static final class id {
public static final int account_confirm_password_desc=0x7f0a001c; public static final int account_confirm_password_desc=0x7f0a001c;

2
gen/org/sufficientlysecure/keychain/api/R.java
View File

@ -8,7 +8,7 @@ package org.sufficientlysecure.keychain.api;
public final class R { public final class R {
public static final class drawable { public static final class drawable {
public static final int ic_action_cancel_launchersize = 0x7f020003; public static final int ic_action_cancel_launchersize = 0x7f020007;
} }
public static final class string { public static final class string {
public static final int openpgp_install_openkeychain_via = 0x7f050001; public static final int openpgp_install_openkeychain_via = 0x7f050001;

5
res/drawable/blue.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FF1da9da" />
</shape>

9
res/drawable/bluebackground.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="false"
android:drawable="@drawable/blue" />
<item
android:state_pressed="true"
android:drawable="@drawable/darkblue" />
</selector>

5
res/drawable/darkblue.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FF0099cc" />
</shape>

5
res/drawable/darkred.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffcc0000" />
</shape>

5
res/drawable/red.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFe92727" />
</shape>

9
res/drawable/redbackground.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="false"
android:drawable="@drawable/red" />
<item
android:state_pressed="true"
android:drawable="@drawable/darkred" />
</selector>

8
res/layout/fragment_conversation.xml
View File

@ -66,7 +66,7 @@
android:id="@+id/new_fingerprint" android:id="@+id/new_fingerprint"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#e92727" android:background="@drawable/redbackground"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
> >
@ -94,7 +94,7 @@
android:id="@+id/pgp_keyentry" android:id="@+id/pgp_keyentry"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#ffa713" android:background="@drawable/bluebackground"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
> >
@ -103,14 +103,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="OpenPGP encrypted messages found" android:text="OpenPGP encrypted messages found"
android:textColor="#000" android:textColor="#eee"
android:textStyle="bold" android:textStyle="bold"
android:padding="8dp" android:padding="8dp"
android:textSize="20sp"/> android:textSize="20sp"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#000" android:textColor="#eee"
android:text="Click here to enter passphrase and decrypt messages" android:text="Click here to enter passphrase and decrypt messages"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"

39
src/eu/siacs/conversations/entities/MucOptions.java
View File

@ -1,5 +1,42 @@
package eu.siacs.conversations.entities; package eu.siacs.conversations.entities;
public class MucOptions { import android.annotation.SuppressLint;
@SuppressLint("DefaultLocale")
public class MucOptions {
public class User {
public static final int ROLE_MODERATOR = 3;
public static final int ROLE_NONE = 0;
public static final int ROLE_PARTICIPANT = 2;
public static final int ROLE_VISITOR = 1;
public static final int AFFILIATION_ADMIN = 4;
public static final int AFFILIATION_OWNER = 3;
public static final int AFFILIATION_MEMBER = 2;
public static final int AFFILIATION_OUTCAST = 1;
public static final int AFFILIATION_NONE = 0;
private int role;
private int affiliation;
public int getRole() {
return this.role;
}
public void setRole(String role) {
role = role.toLowerCase();
if (role.equals("moderator")) {
this.role = ROLE_MODERATOR;
} else if (role.equals("participant")) {
this.role = ROLE_PARTICIPANT;
} else if (role.equals("visitor")) {
this.role = ROLE_VISITOR;
} else {
this.role = ROLE_NONE;
}
}
public int getAffiliation() {
return this.affiliation;
}
public void setAffiliation() {
}
}
} }