diff --git a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml index f4e88b25..b77b5ff8 100644 --- a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml +++ b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="2.2"> - - - - diff --git a/MasterPassword/Java/masterpassword-android/res/drawable/double_.png b/MasterPassword/Java/masterpassword-android/res/drawable/double_.png deleted file mode 100644 index 842e9bec..00000000 Binary files a/MasterPassword/Java/masterpassword-android/res/drawable/double_.png and /dev/null differ diff --git a/MasterPassword/Java/masterpassword-android/res/layout/activity_users.xml b/MasterPassword/Java/masterpassword-android/res/layout/activity_users.xml deleted file mode 100644 index baca123d..00000000 --- a/MasterPassword/Java/masterpassword-android/res/layout/activity_users.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/MasterPassword/Java/masterpassword-android/res/layout/view_user_avatar.xml b/MasterPassword/Java/masterpassword-android/res/layout/view_user_avatar.xml deleted file mode 100644 index 025fae64..00000000 --- a/MasterPassword/Java/masterpassword-android/res/layout/view_user_avatar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/MasterPassword/Java/masterpassword-android/res/values/strings.xml b/MasterPassword/Java/masterpassword-android/res/values/strings.xml index 9890392c..82556446 100644 --- a/MasterPassword/Java/masterpassword-android/res/values/strings.xml +++ b/MasterPassword/Java/masterpassword-android/res/values/strings.xml @@ -1,7 +1,6 @@ Master Password - User Avatar Remember Forget on close Hide password diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/UsersActivity.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/UsersActivity.java deleted file mode 100644 index a6f347b1..00000000 --- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/UsersActivity.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lyndir.masterpassword; - -import android.app.Activity; -import android.os.Bundle; -import android.widget.LinearLayout; -import butterknife.ButterKnife; -import butterknife.InjectView; -import com.lyndir.masterpassword.model.Avatar; -import com.lyndir.masterpassword.model.User; -import com.lyndir.masterpassword.view.AvatarView; - - -public class UsersActivity extends Activity { - - @InjectView(R.id.users) - LinearLayout users; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate( savedInstanceState ); - setContentView( R.layout.activity_users ); - ButterKnife.inject( this ); - } - - @Override - protected void onResume() { - super.onResume(); - - AvatarView avatarView = new AvatarView( this ); - avatarView.setUser( new User( "Maarten Billemont", Avatar.EIGHT ) ); - users.addView( avatarView ); - } -} - diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/Avatar.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/Avatar.java deleted file mode 100644 index d551aa71..00000000 --- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/Avatar.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lyndir.masterpassword.model; - -import com.lyndir.masterpassword.R; - - -/** - * @author lhunath, 2014-08-20 - */ -public enum Avatar { - ZERO( R.drawable.avatar0 ), - ONE( R.drawable.avatar1 ), - TWO( R.drawable.avatar2 ), - THREE( R.drawable.avatar3 ), - FOUR( R.drawable.avatar4 ), - FIVE( R.drawable.avatar5 ), - SIX( R.drawable.avatar6 ), - SEVEN( R.drawable.avatar7 ), - EIGHT( R.drawable.avatar8 ), - NINE( R.drawable.avatar9 ), - TEN( R.drawable.avatar10 ), - ELEVEN( R.drawable.avatar11 ), - TWELVE( R.drawable.avatar12 ), - THIRTEEN( R.drawable.avatar13 ), - FOURTEEN( R.drawable.avatar14 ), - FIFTEEN( R.drawable.avatar15 ), - SIXTEEN( R.drawable.avatar16 ), - SEVENTEEN( R.drawable.avatar17 ), - EIGHTEEN( R.drawable.avatar18 ); - - private final int imageResource; - - Avatar(final int imageResource) { - this.imageResource = imageResource; - } - - public int getImageResource() { - return imageResource; - } -} diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/User.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/User.java deleted file mode 100644 index 88035027..00000000 --- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/User.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lyndir.masterpassword.model; - -import static com.lyndir.lhunath.opal.system.util.StringUtils.strf; - - -/** - * @author lhunath, 2014-08-20 - */ -public class User { - - private final String name; - private final Avatar avatar; - - public User(final String name, final Avatar avatar) { - this.name = name; - this.avatar = avatar; - } - - public String getName() { - return name; - } - - public Avatar getAvatar() { - return avatar; - } - - @Override - public boolean equals(final Object obj) { - return this == obj || obj instanceof User && name.equals( ((User) obj).name ); - } - - @Override - public int hashCode() { - return name.hashCode(); - } - - @Override - public String toString() { - return strf( "{User: %s}", name ); - } -} diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/view/AvatarView.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/view/AvatarView.java deleted file mode 100644 index 6febb0c0..00000000 --- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/view/AvatarView.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lyndir.masterpassword.view; - -import android.content.Context; -import android.view.LayoutInflater; -import android.widget.FrameLayout; -import android.widget.TextView; -import com.lyndir.masterpassword.R; -import com.lyndir.masterpassword.model.User; - - -/** - * @author lhunath, 2014-08-20 - */ -public class AvatarView extends FrameLayout { - - private final TextView userName; - - public AvatarView(final Context context) { - super( context ); - - addView( userName = (TextView) LayoutInflater.from( context ).inflate( R.layout.view_user_avatar, this, false ) ); - } - - public void setUser(User user) { - userName.setText( user.getName() ); - userName.setCompoundDrawables( null, getResources().getDrawable( user.getAvatar().getImageResource() ), null, null ); - } -}