Commit bbf16b1b authored by Donald Shtjefni's avatar Donald Shtjefni

Merge pull request #22 from Mow3l/master

Ui Fix
parents 9c82d458 dc4aacc3
......@@ -68,4 +68,5 @@ dependencies {
}
compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar')
compile 'com.github.paolorotolo:appintro:+'
compile 'com.github.LarsWerkman:Lobsterpicker:+'
}
......@@ -16,6 +16,7 @@ import android.view.MenuItem;
import android.view.View;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.leafpic.app.Adapters.PhotosPagerAdapter;
......@@ -158,6 +159,7 @@ public class PhotoActivity extends AppCompatActivity {
case R.id.Modify:
break;
case R.id.details:
/****DATA****/
Photo f = photos.getCurrentPhoto();
String date = "", size = "", resolution = "";
SimpleDateFormat s = new SimpleDateFormat("dd/mm/yyyy HH:MM");
......@@ -182,6 +184,7 @@ public class PhotoActivity extends AppCompatActivity {
}
cursor.close();
/**DIALOG**/
new MaterialDialog.Builder(this)
.title("Photo Details")
.content("Path: \t" + photos.getCurrentPhoto().Path
......
......@@ -462,7 +462,7 @@ public class PhotosActivity extends AppCompatActivity {
return true;
}
public void fabClicked(View v){
public void fabClick(View v){
Intent i = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
startActivity(i);
}
......
......@@ -101,7 +101,7 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:onClick="fabClicked"
android:onClick="fabClick"
style="@style/fab"
android:theme="@style/ThemeOverlay.AppCompat.Light"
app:borderWidth="0dp"
......
......@@ -11,7 +11,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardElevation="5dp"
android:layout_margin="2dp">
android:layout_margin="1dp"
>
<RelativeLayout
android:id="@+id/layout_card_id"
......
<?xml version="1.0" encoding="utf-8"?>
<!--
<uz.shift.colorpicker.LineColorPicker
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/picker"
android:layout_width="match_parent"
android:layout_height="60dp"
app:orientation="horizontal"/>
\ No newline at end of file
app:orientation="horizontal"/>
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
<com.larswerkman.lobsterpicker.LobsterPicker
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/lobsterpicker"
/>
<com.larswerkman.lobsterpicker.sliders.LobsterShadeSlider
android:id="@+id/shadeslider"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<com.larswerkman.lobsterpicker.sliders.LobsterOpacitySlider
android:id="@+id/opacityslider"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_margin="8dp"
android:orientation="vertical"
tools:ignore="MissingPrefix">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:orientation="vertical"
tools:ignore="MissingPrefix"
>
<ImageView
android:id="@+id/item_image_img"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:adjustViewBounds="false"
android:scaleType="centerCrop"/>
......
Stack trace:
Frame Function Args
0081FF94 777038F4 (00373000, D36E1C23, 00000000, 00000000)
0081FFDC 778356C3 (FFFFFFFF, 7785B6F0, 00000000, 00000000)
0081FFEC 7783568E (00401000, 00373000, 00000000, 00000000)
End of stack trace
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