diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c77..5cd135a0 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,10 @@ + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 2a197e74..6df86d0b 100644 --- a/app/app.iml +++ b/app/app.iml @@ -4,6 +4,8 @@ @@ -17,7 +19,8 @@ @@ -28,20 +31,18 @@ - - - - + + + - - - + + @@ -50,13 +51,6 @@ - - - - - - - @@ -64,6 +58,13 @@ + + + + + + + @@ -85,63 +86,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a7d00cb2..fe909569 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ @@ -29,7 +29,7 @@ @@ -37,6 +37,10 @@ android:label="@string/app_name" android:parentActivityName=".Main.MainActivity" /> + + android:label="@string/app_name" + + + diff --git a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/AboutActivity.java b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/AboutActivity.java index 95463fdb..499ceeb4 100644 --- a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/AboutActivity.java +++ b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/AboutActivity.java @@ -1,5 +1,6 @@ package com.example.avjindersinghsekhon.minimaltodo.About; +import android.content.Intent; import android.content.pm.PackageInfo; import android.graphics.Color; import android.graphics.PorterDuff; @@ -11,6 +12,8 @@ import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.MenuItem; +import android.view.View; +import android.widget.Button; import android.widget.TextView; import com.example.avjindersinghsekhon.minimaltodo.Analytics.AnalyticsApplication; @@ -27,6 +30,7 @@ public class AboutActivity extends AppDefaultActivity { String theme; // private UUID mId; private AnalyticsApplication app; + private Button button; @Override protected void onCreate(Bundle savedInstanceState) { @@ -61,10 +65,14 @@ protected void onCreate(Bundle savedInstanceState) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setHomeAsUpIndicator(backArrow); } + + + } @Override protected int contentViewLayoutRes() { + return R.layout.about_layout; } @@ -75,14 +83,39 @@ protected Fragment createInitialFragment() { @Override public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { case android.R.id.home: if (NavUtils.getParentActivityName(this) != null) { NavUtils.navigateUpFromSameTask(this); } + + return true; + case R.id.button: + Intent intent=new Intent(this, Feedback.class); + startActivity(intent); return true; default: return super.onOptionsItemSelected(item); } } + + + + public void openFeedback(View view){ + if (view.getId()==R.id.button){ + + Intent intent=new Intent(this, Feedback.class); + startActivity(intent); + + + + + + } + } + + + + } diff --git a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/AboutFragment.java b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/AboutFragment.java index 11e26df5..e9d3447e 100644 --- a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/AboutFragment.java +++ b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/AboutFragment.java @@ -45,12 +45,16 @@ public void onClick(View v) { }); } + + @LayoutRes protected int layoutRes() { return R.layout.fragment_about; + } public static AboutFragment newInstance() { return new AboutFragment(); } } + diff --git a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/Feedback.java b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/Feedback.java new file mode 100644 index 00000000..46e4059c --- /dev/null +++ b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/About/Feedback.java @@ -0,0 +1,52 @@ +package com.example.avjindersinghsekhon.minimaltodo.About; + +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; + +import com.example.avjindersinghsekhon.minimaltodo.AppDefault.AppDefaultActivity; +import com.example.avjindersinghsekhon.minimaltodo.R; + +public class Feedback extends AppCompatActivity { + + private EditText ouremail,subject,message; + + Button send; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.feedback_layout); + ouremail= (EditText) findViewById(R.id.email); + subject= (EditText) findViewById(R.id.subject); + message= (EditText) findViewById(R.id.message); + send= (Button) findViewById(R.id.btn_send); + + + send.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + String ourEmail =ouremail.getText().toString(); + String ourSubjectFeedback=subject.getText().toString(); + String ourMessageFeedback=message.getText().toString(); + + Intent send=new Intent(Intent.ACTION_SEND); + send.putExtra(Intent.EXTRA_EMAIL,ourEmail); + send.putExtra(Intent.EXTRA_SUBJECT,ourSubjectFeedback); + send.putExtra(Intent.EXTRA_TEXT,ourMessageFeedback); + send.setType("message/rfc822"); + send.setPackage("com.google.android.gm"); + startActivity(send); + + } + }); + + + } + + +} + diff --git a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Main/MainActivity.java b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Main/MainActivity.java index a981c20f..d99dc32a 100644 --- a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Main/MainActivity.java +++ b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Main/MainActivity.java @@ -25,6 +25,7 @@ protected void onCreate(Bundle savedInstanceState) { } } + @Override protected int contentViewLayoutRes() { return R.layout.activity_main; @@ -39,6 +40,7 @@ protected Fragment createInitialFragment() { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.menu_main, menu); + return true; } @@ -70,6 +72,8 @@ public boolean onOptionsItemSelected(MenuItem item) { startActivity(intent); return true; + + default: return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Main/MainFragment.java b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Main/MainFragment.java index 8577de1e..d582a255 100644 --- a/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Main/MainFragment.java +++ b/app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Main/MainFragment.java @@ -646,6 +646,7 @@ public void onDestroy() { // } @Override protected int layoutRes() { + return R.layout.fragment_main; } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 19f8ae7a..ac4e7103 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,5 +16,8 @@ + + + diff --git a/app/src/main/res/layout/feedback_layout.xml b/app/src/main/res/layout/feedback_layout.xml new file mode 100644 index 00000000..2bdbdf34 --- /dev/null +++ b/app/src/main/res/layout/feedback_layout.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + +