Commit 8bb59e25 authored by Donald Shtjefni's avatar Donald Shtjefni

Merge pull request #25 from Mow3l/master

Theme Dark & Light #1, 2.
parents cfdac210 f033e3eb
package com.leafpic.app.Adapters;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.preference.PreferenceManager;
import android.support.v7.widget.RecyclerView;
import android.text.Html;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.leafpic.app.Base.Album;
import com.leafpic.app.R;
import com.leafpic.app.utils.StringUtils;
import java.util.ArrayList;
......@@ -29,7 +25,7 @@ public class AlbumsAdapter extends RecyclerView.Adapter<AlbumsAdapter.ViewHolder
ArrayList<Album> albums;
private int layout_ID;
boolean selected=false;
private View.OnClickListener mOnClickListener;
private View.OnLongClickListener mOnLongClickListener;
......@@ -61,29 +57,38 @@ public class AlbumsAdapter extends RecyclerView.Adapter<AlbumsAdapter.ViewHolder
holder.name.setTag(a.Path);
SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(holder.picture.getContext());
String textColor;
if (SP.getBoolean("set_dark_theme", false))
textColor="#FAFAFA";
else
textColor="#2b2b2b";
if (a.isSelected()) {
holder.card_layout.setBackgroundColor(holder.card_layout.getContext().getColor(R.color.selected_album));
holder.picture.setColorFilter(0x77000000, PorterDuff.Mode.SRC_ATOP);
holder.selectHolder.setVisibility(View.VISIBLE);
//White Text On White Theme
if (SP.getBoolean("set_dark_theme", false)==false){
selected=true;
holder.name.setText(Html.fromHtml("<i><font color='#FAFAFA'>" + a.DisplayName + "</font></i>"));
holder.nPhotos.setText(Html.fromHtml("<b><font color='" + SP.getString("PrefColor", "#03A9F4") + "'>" + a.getImagesCount() + "</font></b>" + "<font " +
"color='#FAFAFA'> Photos</font>"));
}
} else {
selected=false;
holder.picture.clearColorFilter();
holder.selectHolder.setVisibility(View.INVISIBLE);
if (SP.getBoolean("set_dark_theme", false))
holder.card_layout.setBackgroundColor(holder.card_layout.getContext().getColor(R.color.background_material_dark));
else
holder.card_layout.setBackgroundColor(holder.card_layout.getContext().getColor(R.color.unselected_album));
else
holder.card_layout.setBackgroundColor(holder.card_layout.getContext().getColor(R.color.background_material_light));
}
String textColor;
if (SP.getBoolean("set_dark_theme", false)) textColor="#FAFAFA";
else textColor="#2b2b2b";
holder.name.setText(Html.fromHtml("<i><font color='" + textColor + "'>" + a.DisplayName + "</font></i>"));
holder.nPhotos.setText(Html.fromHtml("<b><font color='" + SP.getString("PrefColor", "#03A9F4") + "'>" + a.getImagesCount() + "</font></b>" + "<font " +
"color='" + textColor + "'> Photos</font>"));
if (selected==false) {
holder.name.setText(Html.fromHtml("<i><font color='" + textColor + "'>" + a.DisplayName + "</font></i>"));
holder.nPhotos.setText(Html.fromHtml("<b><font color='" + SP.getString("PrefColor", "#03A9F4") + "'>" + a.getImagesCount() + "</font></b>" + "<font " +
"color='" + textColor + "'> Photos</font>"));
}
}
public void setOnClickListener(View.OnClickListener lis) {
......
......@@ -68,9 +68,11 @@ public class PhotosAdapter extends RecyclerView.Adapter<PhotosAdapter.ViewHolder
if (f.isSelected()) {
holder.selectHolder.setVisibility(View.VISIBLE);
holder.imageView.setColorFilter(0x88000000, PorterDuff.Mode.SRC_ATOP);
holder.imageView.setPadding(15,15,15,15);
} else {
holder.selectHolder.setVisibility(View.INVISIBLE);
holder.imageView.clearColorFilter();
holder.imageView.setPadding(0,0,0,0);
}
}
......
......@@ -11,16 +11,18 @@ import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.*;
import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Gravity;
import android.view.Menu;
......@@ -29,10 +31,10 @@ import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.leafpic.app.Adapters.AlbumsAdapter;
import com.leafpic.app.Base.Album;
import com.leafpic.app.Base.HandlingAlbums;
import com.leafpic.app.Base.HiddenPhotosHandler;
import com.leafpic.app.utils.StringUtils;
import com.mikepenz.fontawesome_typeface_library.FontAwesome;
import com.mikepenz.iconics.context.IconicsContextWrapper;
......@@ -42,19 +44,14 @@ import com.mikepenz.materialdrawer.Drawer;
import com.mikepenz.materialdrawer.DrawerBuilder;
import com.mikepenz.materialdrawer.model.DividerDrawerItem;
import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
import com.mikepenz.materialdrawer.model.ProfileDrawerItem;
import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import com.mikepenz.materialize.color.Material;
import java.io.File;
public class AlbumsActivity extends AppCompatActivity /*implements FolderChooserDialog.FolderCallback */{
HandlingAlbums albums = new HandlingAlbums(AlbumsActivity.this);
RecyclerView mRecyclerView;
AlbumsAdapter adapt;
Drawer drawer;
Toolbar toolbar;
SharedPreferences SP;
boolean editmode = false, hidden = false;
......@@ -114,6 +111,8 @@ public class AlbumsActivity extends AppCompatActivity /*implements FolderChooser
boolean NavBar = SP.getBoolean("nav_bar", false);
if (NavBar)
getWindow().setNavigationBarColor(getColor(R.color.primary));
else getWindow().setNavigationBarColor(getColor(R.color.md_black_1000));
}
/**** ToolBar *****/
toolbar = (Toolbar) findViewById(R.id.toolbar);
......@@ -131,6 +130,7 @@ public class AlbumsActivity extends AppCompatActivity /*implements FolderChooser
rl.setBackgroundColor(getColor(R.color.background_material_light));
}
PrimaryDrawerItem item1 = new PrimaryDrawerItem().withName("Default").withIcon(FontAwesome.Icon.faw_picture_o);
PrimaryDrawerItem item2 = new PrimaryDrawerItem().withName("Hidden").withIcon(FontAwesome.Icon.faw_eye_slash);
PrimaryDrawerItem item21 = new PrimaryDrawerItem().withName("Map").withIcon(FontAwesome.Icon.faw_globe);
......@@ -139,9 +139,7 @@ public class AlbumsActivity extends AppCompatActivity /*implements FolderChooser
PrimaryDrawerItem item3 = new PrimaryDrawerItem().withName("Settings").withIcon(FontAwesome.Icon.faw_cog);
PrimaryDrawerItem item4 = new PrimaryDrawerItem().withName("GitHub").withIcon(FontAwesome.Icon.faw_github);
PrimaryDrawerItem item5 = new PrimaryDrawerItem().withName("Donate").withIcon(FontAwesome.Icon.faw_gift);
//SecondaryDrawerItem item3 = new SecondaryDrawerItem().withName("Settings").withIcon(FontAwesome.Icon.faw_cog);
//SecondaryDrawerItem item4 = new SecondaryDrawerItem().withName("GitHub").withIcon(FontAwesome.Icon.faw_github);
//SecondaryDrawerItem item5 = new SecondaryDrawerItem().withName("Donate").withIcon(FontAwesome.Icon.faw_gift);
AccountHeader headerResult = new AccountHeaderBuilder()
.withActivity(this)
......@@ -150,7 +148,7 @@ public class AlbumsActivity extends AppCompatActivity /*implements FolderChooser
.build();
result = new DrawerBuilder()
drawer = new DrawerBuilder()
.withActivity(this)
.withToolbar(toolbar)
.withAccountHeader(headerResult)
......@@ -192,9 +190,10 @@ public class AlbumsActivity extends AppCompatActivity /*implements FolderChooser
}
})
.build();
addHiddenFolder_FABEvent();
}
Drawer result;
public void addHiddenFolder_FABEvent() {
FloatingActionButton btnAddFolder = (FloatingActionButton) findViewById(R.id.fab_add_folder);
......
......@@ -11,21 +11,33 @@ import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.*;
import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.text.InputType;
import android.transition.Slide;
import android.view.*;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.leafpic.app.Adapters.PhotosAdapter;
import com.leafpic.app.Base.*;
import com.leafpic.app.Base.Album;
import com.leafpic.app.Base.CustomAlbumsHandler;
import com.leafpic.app.Base.HandlingAlbums;
import com.leafpic.app.Base.HandlingPhotos;
import com.leafpic.app.Base.Photo;
import com.leafpic.app.utils.StringUtils;
import java.io.File;
......@@ -475,6 +487,17 @@ public class PhotosActivity extends AppCompatActivity {
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
/****SET THEME***/
RecyclerView rw = (RecyclerView) findViewById(R.id.grid_photos);
if (SP.getBoolean("set_dark_theme", false)){
//setTheme(R.style.AppTheme_Dark);
rw.setBackgroundColor(getColor(R.color.background_material_dark));
}else {
//setTheme(R.style.AppTheme);
rw.setBackgroundColor(getColor(R.color.background_material_light));
}
headerImage = (ImageView) findViewById(R.id.header_image);
Glide.with(this)
.load(photos.getPreviewAlbumImg())
......
......@@ -14,6 +14,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.leafpic.app.Adapters.SelectAlbumAdapter;
......@@ -75,6 +76,16 @@ public class SelectAlbumActivity extends AppCompatActivity {
}
});
loadAlbumPreview();
//Base Theme
LinearLayout ll = (LinearLayout) findViewById(R.id.select_album_layout);
if (SP.getBoolean("set_dark_theme", false)){
//setTheme(R.style.AppTheme_Dark);
ll.setBackgroundColor(getColor(R.color.background_material_dark));
}else {
//setTheme(R.style.AppTheme);
ll.setBackgroundColor(getColor(R.color.background_material_light));
}
}
private void loadAlbumPreview(){
......
package com.leafpic.app;
import android.content.Intent;
import android.app.Dialog;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.support.v4.content.IntentCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
public class SettingsActivity extends AppCompatActivity {
......@@ -40,11 +41,25 @@ public class SettingsActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getFragmentManager().beginTransaction().replace(android.R.id.content, new MyPreferenceFragment()).commit();
SP = PreferenceManager.getDefaultSharedPreferences(this);
SP.registerOnSharedPreferenceChangeListener(
new SharedPreferences.OnSharedPreferenceChangeListener() {
public void onSharedPreferenceChanged(
SharedPreferences prefs, String key) {
if (!key.equals("nav_bar")) {
initUiTweaks();
return;
}
//System.out.println(key);
}
});
/*
mListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (!key.equals("pref_dark_theme")) {
if (!key.equals("nav_bar")) {
return;
}
......@@ -52,9 +67,17 @@ public class SettingsActivity extends AppCompatActivity {
final Intent intent = getActivity().getIntent();
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | IntentCompat.FLAG_ACTIVITY_CLEAR_TASK);
getActivity().startActivity(intent);
}
};
*/
}
@Override
public void onResume() {
initUiTweaks();
super.onResume();
}
public void initUiTweaks() {
......@@ -63,9 +86,20 @@ public class SettingsActivity extends AppCompatActivity {
SP = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
boolean NavBar = SP.getBoolean("nav_bar", false);
/**** Nav Bar ****/
if (NavBar)
getWindow().setNavigationBarColor(getResources().getColor(R.color.toolbar));
getWindow().setNavigationBarColor(getColor(R.color.toolbar));
else getWindow().setNavigationBarColor(getColor(R.color.md_black_1000));
/**** Status Bar */
getWindow().setStatusBarColor(getColor(R.color.primary));
/*
if (SP.getBoolean("set_dark_theme", false)){
setTheme(R.style.PreferencesThemeLight);
}else {
setTheme(R.style.PreferencesThemeDark);
}
*/
}
}
......@@ -74,24 +108,30 @@ public class SettingsActivity extends AppCompatActivity {
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences);
Preference p = findPreference("accent_color");
Preference p = findPreference("primary_color");
p.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
// custom dialog
final Dialog dialog = new Dialog(getContext());
dialog.setContentView(R.layout.custom_color_piker_primary);
dialog.setTitle("Primary Color");
/* new MaterialDialog.Builder(getContext())
.title(R.string.setting_accent_color_title)
.items(R.array.preference_accent_Color)
.itemsCallbackSingleChoice(-1, new MaterialDialog.ListCallbackSingleChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
return true;
}
})
.positiveText("OK")
.show();*/
// set the custom dialog components - text, image and button
TextView grey = (TextView) dialog.findViewById(R.id.grey);
TextView green = (TextView) dialog.findViewById(R.id.green);
TextView amber = (TextView) dialog.findViewById(R.id.amber);
TextView orange = (TextView) dialog.findViewById(R.id.orange);
Button dialogButton = (Button) dialog.findViewById(R.id.dialogButtonOK);
// if button is clicked, close the custom dialog
dialogButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
dialog.show();
return false;
}
});
......
......@@ -11,34 +11,34 @@
android:background="@color/background_material_dark">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:elevation="5dp">
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:elevation="5dp">
<include layout="@layout/toolbar"
android:id="@+id/toolbar"/>
android:id="@+id/toolbar"/>
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/grid_albums"
android:layout_gravity="center_horizontal"
android:numColumns="auto_fit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/grid_albums"
android:layout_gravity="center_horizontal"
android:numColumns="auto_fit"
/>
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_add_folder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:borderWidth="0dp"
app:elevation="40dp"
app:ico_color="@color/md_white_1000"
app:ico_icon="gmd-add"
app:ico_size="16dp"
android:layout_margin="16dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_gravity="bottom|end"/>
android:id="@+id/fab_add_folder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:borderWidth="0dp"
app:elevation="40dp"
app:ico_color="@color/md_white_1000"
app:ico_icon="gmd-add"
app:ico_size="16dp"
android:layout_margin="16dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_gravity="bottom|end"/>
</RelativeLayout>
......@@ -82,22 +82,14 @@
</android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
>
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/grid_photos"
android:clipToPadding="false"
android:background="@color/md_dark_background"
/>
</android.support.v7.widget.CardView>
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/grid_photos"
android:clipToPadding="false"
android:background="@color/md_dark_background"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_camera"
......
......@@ -4,83 +4,85 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardBackgroundColor="@android:color/background_dark"
app:cardElevation="5dp"
android:layout_margin="1dp"
android:layout_marginTop="2dp"
android:layout_marginLeft="2dp"
>
<RelativeLayout
android:id="@+id/album_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
android:id="@+id/album_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
<RelativeLayout
android:id="@+id/header_album_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/selected_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
android:elevation="10dp"
android:src="@mipmap/ic_done_white_48dp"
android:layout_gravity="center"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
/>
<ImageView
android:id="@+id/album_preview"
android:layout_width="match_parent"
android:layout_height="140dp"
android:scaleType="centerCrop"
/>
</RelativeLayout>
android:id="@+id/selected_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
android:elevation="10dp"
android:src="@mipmap/ic_done_white_48dp"
android:layout_gravity="center"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
/>
<ImageView
android:id="@+id/album_preview"
android:layout_width="match_parent"
android:layout_height="140dp"
android:scaleType="centerCrop"
/>
</RelativeLayout>
<View
android:id="@+id/album_card_divider"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_below="@id/header_album_card"
android:id="@+id/album_card_divider"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_below="@id/header_album_card"
/>
<LinearLayout
android:id="@+id/linear_card_text"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_below="@id/album_card_divider"
android:id="@+id/linear_card_text"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_below="@id/album_card_divider"
>
<TextView
android:id="@+id/album_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:paddingEnd="20dp"
android:paddingTop="10dp"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="16sp"
android:id="@+id/album_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:paddingEnd="20dp"
android:paddingTop="10dp"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="16sp"
/>
<TextView
android:id="@+id/album_photos_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:paddingBottom="10dp"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="14sp"
android:id="@+id/album_photos_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:paddingBottom="10dp"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="14sp"
/>
</LinearLayout>
</RelativeLayout>
......
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/ll"
>
<TextView
android:id="@+id/grey"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#FAFAFA"
android:background="@color/grey_1"
android:text="GREY"
android:layout_margin="4dp"
/>
<TextView
android:id="@+id/amber"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#FAFAFA"
android:background="@color/md_amber_100"
android:text="AMBER"
android:layout_margin="4dp"
/>
<TextView
android:id="@+id/orange"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#FAFAFA"
android:background="@color/fabOrange"
android:text="ORANGE"
android:layout_margin="4dp"
/>
<TextView
android:id="@+id/green"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#FAFAFA"
android:background="@color/toolbar"
android:text="GREEN"
android:layout_margin="4dp"
/>
<Button
android:id="@+id/dialogButtonOK"
android:layout_width="100px"
android:layout_height="wrap_content"
android:text="Ok"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
/>
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
......@@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_margin="2dp"
android:layout_marginTop="2dp"
android:layout_marginLeft="2dp"
>