Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

General Editing #16

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

General Editing #16

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift click to select a range
07edafb
Gradle updated.
Nov 17, 2016
9108452
codeReview
Nov 17, 2016
196cb56
"deprecated" solved for getDrawable
Nov 17, 2016
918a539
README.md edited.
Nov 17, 2016
6ddaefd
gitignore edited.
Nov 17, 2016
374fc43
layouts edited. ( format and codeClean)
Nov 17, 2016
c29dc81
gitignore edited.
Nov 17, 2016
a02e020
The images are resized.
Nov 17, 2016
572f7d1
Direct dialing from the keyboard was added.
Nov 17, 2016
492e689
The databinding structure was added to the xml and java classes.
Nov 18, 2016
e871f27
The databinding structure was added to the xml and java classes.
Nov 18, 2016
3b9cae0
The databinding structure was added to the xml and java classes.
Nov 18, 2016
4e1b4af
SearchBar and Toolbar ids were edited.
Nov 20, 2016
2cf5a0c
The databinding structure was added to the xml and java classes.
Nov 20, 2016
d4e473f
DataBinding
Nov 20, 2016
8946d3c
Id names have been edited
Nov 20, 2016
da58c72
Id names have been edited and codeReview
Nov 20, 2016
b5417a6
DataBinding and Id names have been edited
Nov 20, 2016
5b47408
DataBinding and Id names have been edited
Nov 20, 2016
c24841e
Id names have been edited and codeReview
Nov 20, 2016
a01e383
DataBinding and Id names have been edited (EtkinlikFragment)
Nov 20, 2016
b7a0bce
DataBinding and Id names have been edited (OyunFragment)
Nov 20, 2016
d985902
DataBinding and Id names have been edited (ProfilFragment)
Nov 21, 2016
d65784c
DataBinding and Id names have been edited (WebFragment)
Nov 21, 2016
a91ecb1
bugfix
Nov 21, 2016
a2e1424
Id names have been edited (MobilFragment)
Nov 21, 2016
e565b14
DataBinding and CodeReview
Nov 21, 2016
312463e
Reformat Code
Nov 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
layouts edited. ( format and codeClean)
  • Loading branch information
Ercan PINAR committed Nov 17, 2016
commit 374fc4371b3f539242a36339537c2f309c8f832a
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions GYAppAnd.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 84,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
Expand Down
28 changes: 13 additions & 15 deletions src/main/res/layout/activity_arama.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 1,39 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
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="com.turkcell.gelecegiyazanlar.activities.AramaActivity"
android:background="@color/beyaz_renk"
android:orientation="vertical"
android:background="@color/beyaz_renk">
tools:context="com.turkcell.gelecegiyazanlar.activities.AramaActivity">

<include
android:id="@ id/tool_bar_ara"
layout="@layout/aramabar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
/>
android:layout_height="wrap_content" />

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@color/arama_arkaplan_renk"></LinearLayout>
android:background="@color/arama_arkaplan_renk"/>


<android.support.design.widget.TabLayout
android:id="@ id/tabsArama"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@ id/tabsArama"
app:tabTextColor="@color/beyaz_renk"
app:tabSelectedTextColor="@color/beyaz_renk"
app:tabIndicatorColor="@color/selector"
android:background="@color/tab_default_renk"
app:tabGravity="center"
android:background="@color/tab_default_renk"/>
app:tabIndicatorColor="@color/selector"
app:tabSelectedTextColor="@color/beyaz_renk"
app:tabTextColor="@color/beyaz_renk" />


<android.support.v4.view.ViewPager
android:layout_marginTop="3dp"
android:id="@ id/pagerArama"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_weight="1"
></android.support.v4.view.ViewPager>
android:layout_height="match_parent"
android:layout_marginTop="3dp"
android:layout_weight="1"/>
</LinearLayout>
70 changes: 30 additions & 40 deletions src/main/res/layout/activity_blog_icerik_acitivity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 1,49 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">


<android.support.v7.widget.Toolbar
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@ id/toolbar"
android:minHeight="?attr/actionBarSize"
android:background="@color/blog_icerik_arkaplan_renk"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android">
android:background="@color/blog_icerik_arkaplan_renk"
android:minHeight="?attr/actionBarSize">


<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content">

<TextView
android:id="@ id/txtBaslik"
android:layout_height="wrap_content"
style="@style/mobilIcerikBaslik"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/beyaz_renk" />

<TextView
android:id="@ id/txtYorum"
style="@style/mobilIcerikBaslik"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:text="@string/yorumlar"
android:textColor="@color/beyaz_renk"
/>

<TextView
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/mobilIcerikBaslik"
android:textSize="12sp"
android:id="@ id/txtYorum"
android:text="@string/yorumlar"
android:textColor="@color/beyaz_renk"
android:layout_marginRight="15dp"
android:layout_centerVertical="true"/>
</RelativeLayout>
/>
android:textSize="12sp" />
</RelativeLayout>
/>

<TextView
android:id="@ id/yazarID"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:visibility="gone"

/>
android:visibility="gone"/>


</android.support.v7.widget.Toolbar>
Expand All @@ -56,36 52,30 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/tab_default_renk"
android:padding="5dp"
android:orientation="horizontal"
android:gravity="center_vertical"
>
android:orientation="horizontal"
android:padding="5dp">

<de.hdodenhof.circleimageview.CircleImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@ id/avatar"
android:layout_width="44dp"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />

<TextView
android:id="@ id/yazarIsim"
android:layout_height="wrap_content"
style="@style/mobilIcerikBaslik"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/beyaz_renk"
style="@style/mobilIcerikBaslik"

/>

</LinearLayout>

<WebView
android:id="@ id/blogDetay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@ id/blogDetay"



/>

</LinearLayout>
Expand Down
14 changes: 8 additions & 6 deletions src/main/res/layout/activity_egitim_baslik.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 1,26 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.turkcell.gelecegiyazanlar.activities.EgitimBaslikActivity">

<include
android:id="@ id/tool_bar2"
layout="@layout/toolbar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
/>
android:layout_height="wrap_content" />

<ScrollView
android:layout_below="@id/tool_bar2"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_below="@id/tool_bar2"
android:fillViewport="true">

<ExpandableListView
android:id="@ id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:groupIndicator="@null"
android:id="@ id/list"></ExpandableListView>
android:groupIndicator="@null"/>

</ScrollView>

Expand Down
41 changes: 20 additions & 21 deletions src/main/res/layout/activity_egitim_icerik.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 1,51 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.turkcell.gelecegiyazanlar.activities.EgitimIcerikActivity"
android:orientation="vertical">
android:orientation="vertical"
tools:context="com.turkcell.gelecegiyazanlar.activities.EgitimIcerikActivity">

<include
android:id="@ id/tool_bar2"
layout="@layout/toolbar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
/>
android:layout_height="wrap_content" />

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:background="@color/tab_default_renk"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="5dp"
android:paddingTop="5dp"
>
android:paddingTop="5dp">

<de.hdodenhof.circleimageview.CircleImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@ id/profile_image"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="centerCrop"
app:border_width="1dp"
app:border_color="@color/egitim_icerik_border_renk"
android:layout_gravity="center_vertical"
android:layout_marginLeft="7dp"
/>
android:scaleType="centerCrop"
app:border_color="@color/egitim_icerik_border_renk"
app:border_width="1dp" />

<TextView
android:layout_marginLeft="5dp"
android:id="@ id/yazar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:text=""
android:textSize="14sp"
android:textColor="@color/beyaz_renk"
android:textStyle="bold"
android:layout_gravity="center_vertical" />
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>

<WebView
android:id="@ id/web"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:id="@ id/web"/>
android:layout_height="match_parent" />


</LinearLayout>
86 changes: 42 additions & 44 deletions src/main/res/layout/activity_etkinlik_icerik.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 1,49 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="match_parent"
>
<android.support.v7.widget.Toolbar
android:id="@ id/toolbaretkinlik"
android:minHeight="?attr/actionBarSize"
android:background="@color/blog_icerik_arkaplan_renk"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@ id/txtBaslik"
android:layout_height="wrap_content"
android:layout_width="250dp"
android:text=""
style="@style/mobilIcerikBaslik"
android:textColor="@color/beyaz_renk"
/>
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="match_parent">

<TextView
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@ id/toolbaretkinlik"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/mobilIcerikBaslik"
android:textSize="12sp"
android:id="@ id/txtYorum"
android:text="@string/yorumlar"
android:textColor="@color/beyaz_renk"
android:layout_marginRight="15dp"
android:layout_centerVertical="true"/>
</RelativeLayout>
</android.support.v7.widget.Toolbar>
android:background="@color/blog_icerik_arkaplan_renk"
android:minHeight="?attr/actionBarSize">

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content">

<TextView
android:id="@ id/txtBaslik"
style="@style/mobilIcerikBaslik"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/beyaz_renk" />

<TextView
android:id="@ id/txtYorum"
style="@style/mobilIcerikBaslik"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:text="@string/yorumlar"
android:textColor="@color/beyaz_renk"
android:textSize="12sp" />
</RelativeLayout>
</android.support.v7.widget.Toolbar>

<WebView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@ id/etkinlikDetay"
android:layout_below="@ id/toolbaretkinlik"
/>
</RelativeLayout>
<WebView
android:id="@ id/etkinlikDetay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@ id/toolbaretkinlik" />
</RelativeLayout>
</LinearLayout>
Loading