Commit c29249ac authored by 9731301's avatar 9731301

add ui for some new features

parent 99b6dd3d
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".MenuFeatures.AllNotes.AllNotesActivity"></activity> <activity android:name=".MenuFeatures.Calender.Calender"></activity>
<activity android:name=".MenuFeatures.VoiceMassages.VoiceMassages" />
<activity android:name=".MenuFeatures.AllNotes.AllNotesActivity" />
<activity android:name=".MenuFeatures.AllAchievedNotes.AchivedNotesActivity" /> <activity android:name=".MenuFeatures.AllAchievedNotes.AchivedNotesActivity" />
<activity android:name=".MenuFeatures.Setting.SettingActivity" /> <activity android:name=".MenuFeatures.Setting.SettingActivity" />
<activity android:name=".MainActivity"> <activity android:name=".MainActivity">
......
...@@ -9,12 +9,15 @@ import android.widget.ImageView; ...@@ -9,12 +9,15 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.example.mynotepad.Menu.CustomMenu; import com.example.mynotepad.Menu.CustomMenu;
import com.example.mynotepad.MenuFeatures.Information.InfoClickListener;
import com.example.mynotepad.MenuFeatures.Information.Information;
public class MainActivity extends AppCompatActivity implements View.OnClickListener{ public class MainActivity extends AppCompatActivity implements View.OnClickListener {
ImageView toolbarListImg; ImageView toolbarListImg;
CustomMenu customMenu; CustomMenu customMenu;
TextView wlcTxt; TextView wlcTxt;
Information informationView;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -38,9 +41,20 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -38,9 +41,20 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
customMenu.setVisibility(customMenu.GONE); customMenu.setVisibility(customMenu.GONE);
wlcTxt = findViewById(R.id.wlcTxt); wlcTxt = findViewById(R.id.wlcTxt);
toolbarListImg = findViewById(R.id.toolbarList); toolbarListImg = findViewById(R.id.toolbarList);
informationView = findViewById(R.id.infoView);
informationView.setVisibility(View.GONE);
toolbarListImg.setOnClickListener(this); toolbarListImg.setOnClickListener(this);
findViewById(R.id.main).setOnClickListener(this); findViewById(R.id.main).setOnClickListener(this);
customMenu.setOnClickListener(this);
customMenu.setInfoClickListener(new InfoClickListener() {
@Override
public void onInfoTvClicked(TextView infoTv) {
System.out.println("hiiiiiiiiii");
informationView.setVisibility(View.VISIBLE);
}
});
} }
...@@ -48,6 +62,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -48,6 +62,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
public void onClick(View view) { public void onClick(View view) {
if (view.getId() == toolbarListImg.getId() || customMenu.getId() == view.getId()) { if (view.getId() == toolbarListImg.getId() || customMenu.getId() == view.getId()) {
customMenu.setVisibility(customMenu.VISIBLE); customMenu.setVisibility(customMenu.VISIBLE);
} else if (R.id.main == view.getId()) customMenu.setVisibility(customMenu.GONE); informationView.setVisibility(View.GONE);
} else if (R.id.main == view.getId()) {
customMenu.setVisibility(customMenu.GONE);
informationView.setVisibility(View.GONE);
}
} }
} }
\ No newline at end of file
...@@ -10,14 +10,19 @@ import android.widget.TextView; ...@@ -10,14 +10,19 @@ import android.widget.TextView;
import com.example.mynotepad.MenuFeatures.AllAchievedNotes.AchivedNotesActivity; import com.example.mynotepad.MenuFeatures.AllAchievedNotes.AchivedNotesActivity;
import com.example.mynotepad.MenuFeatures.AllNotes.AllNotesActivity; import com.example.mynotepad.MenuFeatures.AllNotes.AllNotesActivity;
import com.example.mynotepad.MenuFeatures.Information.InfoClickListener;
import com.example.mynotepad.MenuFeatures.Setting.SettingActivity; import com.example.mynotepad.MenuFeatures.Setting.SettingActivity;
import com.example.mynotepad.MenuFeatures.VoiceMassages.VoiceMassages;
import com.example.mynotepad.R; import com.example.mynotepad.R;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import java.util.Calendar;
public class CustomMenu extends LinearLayout implements View.OnClickListener { public class CustomMenu extends LinearLayout implements View.OnClickListener {
private View rootView; private View rootView;
private TextView settingTv, allNotesTv, achievedTv; private TextView settingTv, allNotesTv, achievedTv, calenderTv, informationTv, voiceMassagesTv;
private ImageView img; private ImageView img;
private InfoClickListener infoClickListener;
public CustomMenu(Context context) { public CustomMenu(Context context) {
super(context); super(context);
...@@ -35,11 +40,17 @@ public class CustomMenu extends LinearLayout implements View.OnClickListener { ...@@ -35,11 +40,17 @@ public class CustomMenu extends LinearLayout implements View.OnClickListener {
settingTv = findViewById(R.id.settingTxt); settingTv = findViewById(R.id.settingTxt);
allNotesTv = findViewById(R.id.allNotesTxt); allNotesTv = findViewById(R.id.allNotesTxt);
achievedTv = findViewById(R.id.achievedTxt); achievedTv = findViewById(R.id.achievedTxt);
calenderTv = findViewById(R.id.calenderTxt);
informationTv = findViewById(R.id.infoTxt);
voiceMassagesTv = findViewById(R.id.voiceTxt);
img = findViewById(R.id.imageView5); img = findViewById(R.id.imageView5);
settingTv.setOnClickListener(this); settingTv.setOnClickListener(this);
allNotesTv.setOnClickListener(this); allNotesTv.setOnClickListener(this);
achievedTv.setOnClickListener(this); achievedTv.setOnClickListener(this);
calenderTv.setOnClickListener(this);
informationTv.setOnClickListener(this);
voiceMassagesTv.setOnClickListener(this);
img.setOnClickListener(this); img.setOnClickListener(this);
} }
...@@ -51,13 +62,27 @@ public class CustomMenu extends LinearLayout implements View.OnClickListener { ...@@ -51,13 +62,27 @@ public class CustomMenu extends LinearLayout implements View.OnClickListener {
showAllNotes(); showAllNotes();
} else if (view.getId() == achievedTv.getId()) { } else if (view.getId() == achievedTv.getId()) {
showAchieved(); showAchieved();
} else if (view.getId() == img.getId()) { } else if (view.getId() == calenderTv.getId()) {
Snackbar.make(view, "this is zahra's app ;)", Snackbar.LENGTH_LONG).setAction("Action", null).show(); showCalender();
} else if (view.getId() == informationTv.getId()) {
infoClickListener.onInfoTvClicked(informationTv);
} else if (view.getId() == voiceMassagesTv.getId()) {
showVoiceMassages();
} else { } else {
this.setVisibility(this.GONE); Snackbar.make(view, "this is zahra's app ;)", Snackbar.LENGTH_LONG).setAction("Action", null).show();
} }
} }
private void showVoiceMassages() {
Intent intent = new Intent(getContext(), VoiceMassages.class);
getContext().startActivity(intent);
}
private void showCalender() {
Intent intent = new Intent(getContext(), Calendar.class);
getContext().startActivity(intent);
}
private void showAchieved() { private void showAchieved() {
Intent newIntent = new Intent(getContext(), AchivedNotesActivity.class); Intent newIntent = new Intent(getContext(), AchivedNotesActivity.class);
getContext().startActivity(newIntent); getContext().startActivity(newIntent);
...@@ -72,4 +97,8 @@ public class CustomMenu extends LinearLayout implements View.OnClickListener { ...@@ -72,4 +97,8 @@ public class CustomMenu extends LinearLayout implements View.OnClickListener {
Intent newIntent = new Intent(getContext(), AllNotesActivity.class); Intent newIntent = new Intent(getContext(), AllNotesActivity.class);
getContext().startActivity(newIntent); getContext().startActivity(newIntent);
} }
public void setInfoClickListener(InfoClickListener infoClickListener) {
this.infoClickListener = infoClickListener;
}
} }
...@@ -3,7 +3,6 @@ package com.example.mynotepad.MenuFeatures.AllNotes; ...@@ -3,7 +3,6 @@ package com.example.mynotepad.MenuFeatures.AllNotes;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
......
package com.example.mynotepad.MenuFeatures.Calender;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import com.example.mynotepad.R;
public class Calender extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_calender);
}
}
\ No newline at end of file
package com.example.mynotepad.MenuFeatures.Information;
import android.widget.TextView;
public interface InfoClickListener {
void onInfoTvClicked(TextView infoTv);
}
package com.example.mynotepad.MenuFeatures.Information;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
import android.widget.LinearLayout;
import androidx.annotation.Nullable;
import com.example.mynotepad.R;
public class Information extends LinearLayout {
private View rootView;
public Information(Context context) {
super(context);
init(context);
}
public Information(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
init(context);
}
private void init(Context context) {
rootView = inflate(context , R.layout.information , this);
}
}
package com.example.mynotepad.MenuFeatures.VoiceMassages;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import com.example.mynotepad.R;
public class VoiceMassages extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_voice_massages);
}
}
\ No newline at end of file
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,15c1.66,0 2.99,-1.34 2.99,-3L15,6c0,-1.66 -1.34,-3 -3,-3S9,4.34 9,6v6c0,1.66 1.34,3 3,3zM17.3,12c0,3 -2.54,5.1 -5.3,5.1S6.7,15 6.7,12L5,12c0,3.42 2.72,6.23 6,6.72L11,22h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
</vector>
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MenuFeatures.Calender.Calender">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -52,6 +52,8 @@ ...@@ -52,6 +52,8 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="173dp" android:layout_marginTop="173dp"
android:layout_marginBottom="37dp" /> android:layout_marginBottom="37dp" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
...@@ -62,4 +64,10 @@ ...@@ -62,4 +64,10 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="2dp" /> android:layout_marginTop="2dp" />
<com.example.mynotepad.MenuFeatures.Information.Information
android:id="@+id/infoView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</FrameLayout> </FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MenuFeatures.VoiceMassages.VoiceMassages">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -41,22 +41,16 @@ ...@@ -41,22 +41,16 @@
android:layout_width="22dp" android:layout_width="22dp"
android:layout_height="22dp" android:layout_height="22dp"
android:layout_marginLeft="18dp" android:layout_marginLeft="18dp"
android:src="@drawable/black_star"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
/> android:src="@drawable/black_star" />
<ImageView <ImageView
android:id="@+id/imageView4" android:id="@+id/voiceImg"
android:layout_width="22dp" android:layout_width="22dp"
android:layout_height="22dp" android:layout_height="22dp"
android:layout_marginLeft="18dp" android:layout_marginLeft="18dp"
android:src="@drawable/setting"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
/> android:src="@drawable/voice" />
<ImageView <ImageView
android:id="@+id/calenderImg" android:id="@+id/calenderImg"
...@@ -66,6 +60,13 @@ ...@@ -66,6 +60,13 @@
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:src="@drawable/calender" /> android:src="@drawable/calender" />
<ImageView
android:id="@+id/imageView4"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginLeft="18dp"
android:layout_marginTop="15dp"
android:src="@drawable/setting" />
<ImageView <ImageView
...@@ -73,9 +74,8 @@ ...@@ -73,9 +74,8 @@
android:layout_width="22dp" android:layout_width="22dp"
android:layout_height="22dp" android:layout_height="22dp"
android:layout_marginLeft="18dp" android:layout_marginLeft="18dp"
android:src="@drawable/information" android:layout_marginTop="17dp"
android:layout_marginTop="15dp"/> android:src="@drawable/information" />
</LinearLayout> </LinearLayout>
...@@ -91,12 +91,11 @@ ...@@ -91,12 +91,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_weight="5" android:layout_weight="5"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/all_notes" android:text="@string/all_notes"
android:textSize="20dp" android:textSize="20dp" />
android:layout_marginTop="10dp"
/>
<TextView <TextView
...@@ -104,36 +103,42 @@ ...@@ -104,36 +103,42 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_weight="6" android:layout_weight="6"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/achieved" android:text="@string/achieved"
android:textSize="20dp" android:textSize="20dp" />
android:layout_marginTop="10dp"
/>
<TextView <TextView
android:id="@+id/settingTxt" android:id="@+id/voiceTxt"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:gravity="center_vertical"
android:text="@string/setting"
android:textSize="20dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
/> android:gravity="center_vertical"
android:text="@string/voice_massages"
android:textSize="20dp" />
<TextView <TextView
android:id="@+id/calenderTxt" android:id="@+id/calenderTxt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/calender" android:text="@string/calender"
android:textSize="20dp" android:textSize="20dp" />
<TextView
android:id="@+id/settingTxt"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
/> android:gravity="center_vertical"
android:text="@string/setting"
android:textSize="20dp" />
<TextView <TextView
android:id="@+id/infoTxt" android:id="@+id/infoTxt"
...@@ -145,6 +150,7 @@ ...@@ -145,6 +150,7 @@
android:text="@string/information" android:text="@string/information"
android:textSize="20dp" /> android:textSize="20dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/imageView6"
android:layout_width="356dp"
android:layout_height="356dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/index"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_marginLeft="20dp"
android:textSize="18dp"
android:text=" published by : \n seyedeh zahra fatehi "
android:background="#95D6D0"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="120dp"
android:layout_marginLeft="20dp"
android:textSize="18dp"
android:text=" email :\n s.fatehi1378@gmail.com "
android:background="#95D6D0"/>
</FrameLayout>
\ No newline at end of file
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
<string name="setting">setting</string> <string name="setting">setting</string>
<string name="achieved">achieved</string> <string name="achieved">achieved</string>
<string name="all_notes">all notes</string> <string name="all_notes">all notes</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment">Hello blank fragment</string>
<string name="title">title</string> <string name="title">title</string>
<string name="calender">calender</string> <string name="calender">calender</string>
<string name="information">information</string> <string name="information">information</string>
<string name="information">information</string> <string name="voice_massages">voice massages</string>
</resources> </resources>
\ No newline at end of file
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