Commit 215c662d authored by Gilbert Ndresaj's avatar Gilbert Ndresaj

Some Clean

Settings View Clen
Album Menu Stuff
parent 82f33d9f
...@@ -602,6 +602,8 @@ public class MainActivity extends SharedMediaActivity { ...@@ -602,6 +602,8 @@ public class MainActivity extends SharedMediaActivity {
menu.findItem(R.id.hideAlbumButton).setTitle(hidden ? getString(R.string.unhide) : getString(R.string.hide)); menu.findItem(R.id.hideAlbumButton).setTitle(hidden ? getString(R.string.unhide) : getString(R.string.hide));
menu.findItem(R.id.search_action).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_search)); menu.findItem(R.id.search_action).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_search));
menu.findItem(R.id.delete_action).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_delete)); menu.findItem(R.id.delete_action).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_delete));
menu.findItem(R.id.renameAlbum).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_create));
menu.findItem(R.id.select_all).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_select_all));
menu.findItem(R.id.sort_action).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_sort)); menu.findItem(R.id.sort_action).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_sort));
menu.findItem(R.id.filter_menu).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_filter_list)); menu.findItem(R.id.filter_menu).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_filter_list));
menu.findItem(R.id.sharePhotos).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_share)); menu.findItem(R.id.sharePhotos).setIcon(getToolbarIcon(GoogleMaterial.Icon.gmd_share));
...@@ -634,6 +636,10 @@ public class MainActivity extends SharedMediaActivity { ...@@ -634,6 +636,10 @@ public class MainActivity extends SharedMediaActivity {
menu.findItem(R.id.type_sort_action).setVisible(!albumsMode); menu.findItem(R.id.type_sort_action).setVisible(!albumsMode);
menu.findItem(R.id.delete_action).setVisible(!albumsMode || editMode); menu.findItem(R.id.delete_action).setVisible(!albumsMode || editMode);
menu.findItem(R.id.select_all).setShowAsAction(albumsMode && getAlbums().getSelectedCount()>1
? MenuItem.SHOW_AS_ACTION_IF_ROOM
: MenuItem.SHOW_AS_ACTION_NEVER);
menu.findItem(R.id.clear_album_preview).setVisible(!albumsMode && getAlbum().hasCustomCover()); menu.findItem(R.id.clear_album_preview).setVisible(!albumsMode && getAlbum().hasCustomCover());
menu.findItem(R.id.renameAlbum).setVisible((albumsMode && getAlbums().getSelectedCount() == 1) || (!albumsMode && !editMode)); menu.findItem(R.id.renameAlbum).setVisible((albumsMode && getAlbums().getSelectedCount() == 1) || (!albumsMode && !editMode));
if (getAlbums().getSelectedCount() == 1) if (getAlbums().getSelectedCount() == 1)
......
...@@ -135,14 +135,9 @@ public class SettingsActivity extends ThemedActivity { ...@@ -135,14 +135,9 @@ public class SettingsActivity extends ThemedActivity {
if (Security.isPasswordSet(getApplicationContext())) { if (Security.isPasswordSet(getApplicationContext())) {
Security.askPassword(SettingsActivity.this, new Security.PasswordInterface() { Security.askPassword(SettingsActivity.this, new Security.PasswordInterface() {
@Override @Override
public void onSuccess() { public void onSuccess() {startActivity(new Intent(getApplicationContext(), SecurityActivity.class));}
startActivity(new Intent(getApplicationContext(), SecurityActivity.class));
}
@Override @Override
public void onError() { public void onError() {Toast.makeText(getApplicationContext(), R.string.wrong_password, Toast.LENGTH_SHORT).show();}
Toast.makeText(getApplicationContext(), R.string.wrong_password, Toast.LENGTH_SHORT).show();
}
}); });
} else startActivity(new Intent(getApplicationContext(), SecurityActivity.class)); } else startActivity(new Intent(getApplicationContext(), SecurityActivity.class));
} }
...@@ -220,5 +215,4 @@ public class SettingsActivity extends ThemedActivity { ...@@ -220,5 +215,4 @@ public class SettingsActivity extends ThemedActivity {
public void onChangeColumnsClicked(View view) { public void onChangeColumnsClicked(View view) {
new GeneralSetting(SettingsActivity.this, SP).editNumberOfColumns(); new GeneralSetting(SettingsActivity.this, SP).editNumberOfColumns();
} }
} }
...@@ -64,14 +64,10 @@ public class SettingBasic extends FrameLayout implements Themeable { ...@@ -64,14 +64,10 @@ public class SettingBasic extends FrameLayout implements Themeable {
title.setText(titleRes); title.setText(titleRes);
caption.setText(captionRes); caption.setText(captionRes);
setPadding( /*
(int) getResources().getDimension(R.dimen.medium_spacing), setPadding((int) getResources().getDimension(R.dimen.medium_spacing), 0, (int) getResources().getDimension(R.dimen.medium_spacing), 0);
0,
(int) getResources().getDimension(R.dimen.medium_spacing),
0
);
setMinimumHeight((int) getResources().getDimension(R.dimen.listitem_height_twoline)); setMinimumHeight((int) getResources().getDimension(R.dimen.listitem_height_twoline));
*/
super.onFinishInflate(); super.onFinishInflate();
} }
......
...@@ -80,14 +80,10 @@ public class SettingWithSwitchView extends FrameLayout implements View.OnClickLi ...@@ -80,14 +80,10 @@ public class SettingWithSwitchView extends FrameLayout implements View.OnClickLi
toggle.setChecked(isChecked()); toggle.setChecked(isChecked());
super.setOnClickListener(this); super.setOnClickListener(this);
setPadding( /*
(int) getResources().getDimension(R.dimen.medium_spacing), setPadding((int) getResources().getDimension(R.dimen.medium_spacing), 0,(int) getResources().getDimension(R.dimen.medium_spacing), 0);
0,
(int) getResources().getDimension(R.dimen.medium_spacing),
0
);
setMinimumHeight((int) getResources().getDimension(R.dimen.listitem_height_twoline)); setMinimumHeight((int) getResources().getDimension(R.dimen.listitem_height_twoline));
*/
super.onFinishInflate(); super.onFinishInflate();
} }
......
...@@ -34,12 +34,11 @@ ...@@ -34,12 +34,11 @@
android:foreground="@drawable/ripple" android:foreground="@drawable/ripple"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:paddingBottom="@dimen/small_spacing">
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory <org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory
android:id="@+id/general_setting_title" android:id="@+id/general_setting_title"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -100,12 +99,11 @@ ...@@ -100,12 +99,11 @@
android:foreground="@drawable/ripple" android:foreground="@drawable/ripple"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:paddingBottom="@dimen/small_spacing">
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory <org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory
android:id="@+id/theme_setting_title" android:id="@+id/theme_setting_title"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -153,7 +151,6 @@ ...@@ -153,7 +151,6 @@
app:settingIcon="gmd-colorize" app:settingIcon="gmd-colorize"
app:settingTitle="@string/media_viewer"/> app:settingTitle="@string/media_viewer"/>
<!-- CARD VIEW STYLE --> <!-- CARD VIEW STYLE -->
<org.horaapps.leafpic.views.SettingBasic <org.horaapps.leafpic.views.SettingBasic
android:id="@+id/ll_card_view_style" android:id="@+id/ll_card_view_style"
...@@ -163,7 +160,6 @@ ...@@ -163,7 +160,6 @@
app:settingIcon="gmd-dashboard" app:settingIcon="gmd-dashboard"
app:settingTitle="@string/album_card_view"/> app:settingTitle="@string/album_card_view"/>
<!-- TRANSLUCENT STATUS BAR--> <!-- TRANSLUCENT STATUS BAR-->
<org.horaapps.leafpic.views.SettingWithSwitchView <org.horaapps.leafpic.views.SettingWithSwitchView
android:id="@+id/option_statusbar" android:id="@+id/option_statusbar"
...@@ -200,12 +196,11 @@ ...@@ -200,12 +196,11 @@
android:foreground="@drawable/ripple" android:foreground="@drawable/ripple"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:paddingBottom="@dimen/small_spacing">
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory <org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory
android:id="@+id/picture_setting_title" android:id="@+id/picture_setting_title"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -248,7 +243,6 @@ ...@@ -248,7 +243,6 @@
app:settingPreferenceKey="@string/preference_delay_full_image" app:settingPreferenceKey="@string/preference_delay_full_image"
app:settingTitle="@string/delay_load_full_size_image"/> app:settingTitle="@string/delay_load_full_size_image"/>
<!--SWIPE ORIENTATION TODO: implement feature --> <!--SWIPE ORIENTATION TODO: implement feature -->
<org.horaapps.leafpic.views.SettingWithSwitchView <org.horaapps.leafpic.views.SettingWithSwitchView
android:id="@+id/option_swipe_direction" android:id="@+id/option_swipe_direction"
...@@ -272,12 +266,11 @@ ...@@ -272,12 +266,11 @@
android:foreground="@drawable/ripple" android:foreground="@drawable/ripple"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:paddingBottom="@dimen/small_spacing">
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory <org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory
android:id="@+id/video_setting_title" android:id="@+id/video_setting_title"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -298,12 +291,10 @@ ...@@ -298,12 +291,10 @@
app:settingIcon="gmd-videocam" app:settingIcon="gmd-videocam"
app:settingPreferenceKey="@string/preference_swipe_direction_inverted" app:settingPreferenceKey="@string/preference_swipe_direction_inverted"
app:settingTitle="@string/include_video"/> app:settingTitle="@string/include_video"/>
</LinearLayout> </LinearLayout>
</org.horaapps.leafpic.views.themeable.ThemeableCardView> </org.horaapps.leafpic.views.themeable.ThemeableCardView>
<!--ADVANCED SETTING--> <!--ADVANCED SETTING-->
<org.horaapps.leafpic.views.themeable.ThemeableCardView <org.horaapps.leafpic.views.themeable.ThemeableCardView
android:id="@+id/advanced_setting_card" android:id="@+id/advanced_setting_card"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -313,12 +304,11 @@ ...@@ -313,12 +304,11 @@
android:foreground="@drawable/ripple" android:foreground="@drawable/ripple"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:paddingBottom="@dimen/small_spacing">
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory <org.horaapps.leafpic.views.themeable.ThemeableSettingsCategory
android:id="@+id/advanced_setting_title" android:id="@+id/advanced_setting_title"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -330,7 +320,7 @@ ...@@ -330,7 +320,7 @@
android:textSize="@dimen/medium_text" android:textSize="@dimen/medium_text"
android:textStyle="bold"/> android:textStyle="bold"/>
<!-- SUB SCALING-->
<org.horaapps.leafpic.views.SettingWithSwitchView <org.horaapps.leafpic.views.SettingWithSwitchView
android:id="@+id/option_sub_scaling" android:id="@+id/option_sub_scaling"
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -43,6 +43,65 @@ ...@@ -43,6 +43,65 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_below="@id/header_album_card" /> android:layout_below="@id/header_album_card" />
<!--
<LinearLayout
android:id="@+id/linear_card_text"
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:orientation="horizontal"
android:paddingLeft="@dimen/medium_spacing"
android:paddingRight="@dimen/medium_spacing"
android:paddingBottom="@dimen/small_spacing"
android:paddingTop="@dimen/small_spacing">
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/album_icon"
app:iiv_icon="gmd-save"
app:iiv_color="@color/md_dark_primary_icon"
android:layout_width="@dimen/icon_width_height"
android:layout_height="@dimen/icon_width_height"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/medium_spacing"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/album_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="@dimen/medium_text" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/ll_n_media"
android:orientation="horizontal">
<TextView
android:id="@+id/album_photos_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="4dp"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="@dimen/sub_medium_text" />
<TextView
android:id="@+id/album_media_label"
android:layout_width="wrap_content"
android:text="@string/media"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="@dimen/sub_medium_text" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
-->
<LinearLayout <LinearLayout
android:id="@+id/linear_card_text" android:id="@+id/linear_card_text"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -85,6 +144,7 @@ ...@@ -85,6 +144,7 @@
android:textSize="@dimen/sub_medium_text" /> android:textSize="@dimen/sub_medium_text" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
\ No newline at end of file
...@@ -129,16 +129,14 @@ ...@@ -129,16 +129,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/affix_save_here" android:text="@string/affix_save_here"
android:textColor="@color/md_dark_background" android:textColor="@color/md_dark_background"
android:textSize="16sp" android:textSize="16sp" />
/>
<TextView <TextView
android:id="@+id/save_here_sub" android:id="@+id/save_here_sub"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/affix_save_here_sub" android:text="@string/affix_save_here_sub"
android:textColor="@color/md_grey_400" android:textColor="@color/md_grey_400"
android:textSize="14sp" android:textSize="14sp" />
/>
</LinearLayout> </LinearLayout>
<android.support.v7.widget.SwitchCompat <android.support.v7.widget.SwitchCompat
android:id="@+id/save_here_switch" android:id="@+id/save_here_switch"
...@@ -252,15 +250,13 @@ ...@@ -252,15 +250,13 @@
android:text="Quality 50" android:text="Quality 50"
android:textColor="@color/md_grey_400" android:textColor="@color/md_grey_400"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:textSize="14sp" android:textSize="14sp" />
/>
<SeekBar <SeekBar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:progress="50" android:progress="50"
android:max="100" android:max="100"
android:id="@+id/seek_bar_quality" android:id="@+id/seek_bar_quality" />
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
...@@ -5,38 +5,41 @@ ...@@ -5,38 +5,41 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:parentTag="FrameLayout"> tools:parentTag="FrameLayout">
<org.horaapps.leafpic.views.themeable.ThemeableSettingsIcon
android:id="@+id/icon"
android:layout_width="@dimen/icon_width_height"
android:layout_height="@dimen/icon_width_height"
android:layout_gravity="start|center_vertical"
app:iiv_icon="gmd-add-circle"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:orientation="horizontal"
android:layout_marginStart="56dp" android:paddingBottom="@dimen/sub_medium_spacing"
android:gravity="center_vertical" android:paddingTop="@dimen/sub_medium_spacing"
android:orientation="vertical" android:paddingRight="@dimen/medium_spacing">
android:paddingBottom="@dimen/small_spacing" <org.horaapps.leafpic.views.themeable.ThemeableSettingsIcon
android:paddingTop="@dimen/small_spacing"> android:id="@+id/icon"
android:layout_width="@dimen/icon_width_height"
<org.horaapps.leafpic.views.themeable.ThemeableSettingsTitle android:layout_height="@dimen/icon_width_height"
android:id="@+id/title" android:layout_gravity="center_horizontal|center_vertical"
style="@style/TextAppearance.AppCompat.Subhead" android:layout_marginRight="@dimen/big_spacing"
android:layout_marginLeft="@dimen/big_spacing"
app:iiv_icon="gmd-android"/>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/md_dark_background" android:layout_gravity="center_vertical"
tools:text="@string/fab_options"/> android:gravity="center_vertical"
android:orientation="vertical">
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCaption <org.horaapps.leafpic.views.themeable.ThemeableSettingsTitle
android:id="@+id/caption" android:id="@+id/title"
style="@style/TextAppearance.AppCompat.Caption" style="@style/TextAppearance.AppCompat.Subhead"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/md_grey_400" android:textColor="@color/md_grey_200"
tools:text="@string/fab_options_sub"/> tools:text="title text goes here"/>
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCaption
android:id="@+id/caption"
style="@style/TextAppearance.AppCompat.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/md_grey_400"
tools:text="caption text goes here"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</merge> </merge>
\ No newline at end of file
...@@ -4,50 +4,56 @@ ...@@ -4,50 +4,56 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:paddingLeft="16dp"
tools:paddingRight="16dp"
tools:parentTag="FrameLayout"> tools:parentTag="FrameLayout">
<org.horaapps.leafpic.views.themeable.ThemeableSettingsIcon
android:id="@+id/icon"
android:layout_width="@dimen/icon_width_height"
android:layout_height="@dimen/icon_width_height"
android:layout_gravity="start|center_vertical"
app:iiv_icon="gmd-add-circle"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:orientation="horizontal"
android:layout_marginEnd="48dp" android:paddingBottom="@dimen/sub_medium_spacing"
android:layout_marginStart="56dp" android:paddingTop="@dimen/sub_medium_spacing"
android:gravity="center_vertical" android:paddingRight="@dimen/medium_spacing">
android:orientation="vertical" <org.horaapps.leafpic.views.themeable.ThemeableSettingsIcon
android:paddingBottom="@dimen/small_spacing" android:id="@+id/icon"
android:paddingTop="@dimen/small_spacing"> android:layout_width="@dimen/icon_width_height"
android:layout_height="@dimen/icon_width_height"
<org.horaapps.leafpic.views.themeable.ThemeableSettingsTitle android:layout_gravity="center_horizontal|center_vertical"
android:id="@+id/title" android:layout_marginRight="@dimen/big_spacing"
style="@style/Base.TextAppearance.AppCompat.Subhead" android:layout_marginLeft="@dimen/big_spacing"
app:iiv_icon="gmd-android"/>
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/md_dark_background" android:gravity="center_vertical"
tools:text="@string/fab_options"/> android:orientation="horizontal">
<LinearLayout
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCaption android:layout_width="match_parent"
android:id="@+id/caption" android:layout_height="wrap_content"
style="@style/TextAppearance.AppCompat.Caption" android:orientation="vertical"
android:layout_width="match_parent" android:layout_marginEnd="44dp">
android:layout_height="wrap_content" <org.horaapps.leafpic.views.themeable.ThemeableSettingsTitle
android:textColor="@color/md_grey_400" android:id="@+id/title"
tools:text="@string/fab_options_sub"/> style="@style/Base.TextAppearance.AppCompat.Subhead"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/md_grey_200"
tools:text="title text goes here"/>
<org.horaapps.leafpic.views.themeable.ThemeableSettingsCaption
android:id="@+id/caption"
style="@style/TextAppearance.AppCompat.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/md_grey_400"
tools:text="caption text goes here"/>
</LinearLayout>
<android.support.v7.widget.SwitchCompat
android:id="@+id/toggle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:layout_gravity="end|center_vertical"
android:hapticFeedbackEnabled="true"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>
<android.support.v7.widget.SwitchCompat
android:id="@+id/toggle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:layout_gravity="end|center_vertical"
android:hapticFeedbackEnabled="true"/>
</merge> </merge>
\ No newline at end of file
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<item <item
android:id="@+id/renameAlbum" android:id="@+id/renameAlbum"
android:title="@string/rename" android:title="@string/rename"
app:showAsAction="never" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/select_all" android:id="@+id/select_all"
android:title="@string/select_all" android:title="@string/select_all"
......
...@@ -7,7 +7,7 @@ buildscript { ...@@ -7,7 +7,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0-rc1' classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'me.tatarka:gradle-retrolambda:3.6.0' classpath 'me.tatarka:gradle-retrolambda:3.6.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
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