diff --git a/.gitignore b/.gitignore index 9c4de58..69ab424 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ +*.iml .gradle /local.properties /.idea/workspace.xml /.idea/libraries +/.idea/misc.xml .DS_Store /build /captures +.externalNativeBuild \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..cb1559a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..47bd81f --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..7158618 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..fd8a61b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/GYAppAnd.iml b/GYAppAnd.iml new file mode 100644 index 0000000..5c98dbd --- /dev/null +++ b/GYAppAnd.iml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index ab808db..3d85026 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ EtkinlikFragment gibi diğer sayfalara geçişler sağlanmaktadır. Ayrıca aram Uygulamamız Google’ın son çıkardığı design yani Material Design kullanımına uyumludur. -Bunu yapabilmek için ise kütüphane olarak ‘com.android.support:design:22.2.0’ +Bunu yapabilmek için ise kütüphane olarak ‘com.android.support:design:23.0.0’ kütüphanesini projemize ekledik. diff --git a/build.gradle b/build.gradle index cb4e809..60a5732 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.2.2' } } @@ -22,8 +22,8 @@ allprojects { } android { - compileSdkVersion 22 - buildToolsVersion "23.0.0 rc2" + compileSdkVersion 23 + buildToolsVersion '23.0.3' compileOptions.encoding = "windows-1254" defaultConfig { @@ -39,21 +39,23 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + dataBinding { + enabled = true; + } } dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:22.2.0' - compile 'com.android.support:recyclerview-v7:22.2.0' + compile 'com.android.support:appcompat-v7:23.0.0' + compile 'com.android.support:recyclerview-v7:23.0.0' compile 'eu.the4thfloor.volley:com.android.volley:2015.05.28' compile 'de.hdodenhof:circleimageview:1.3.0' - compile 'com.android.support:cardview-v7:22.2.0' + compile 'com.android.support:cardview-v7:23.0.0' compile files('libs/activation.jar') compile files('libs/additionnal.jar') compile 'com.getbase:floatingactionbutton:1.10.0' - compile 'com.android.support:design:22.2.0' + compile 'com.android.support:design:23.0.0' compile files('libs/curiosdk.jar') compile 'com.google.android.gms:play-services:7.8.0' compile 'com.splunk.mint:mint:4.4.0' - } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..04e285f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/activities/AramaActivity.java b/src/main/java/com/turkcell/gelecegiyazanlar/activities/AramaActivity.java index 52f8582..f9b9725 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/activities/AramaActivity.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/activities/AramaActivity.java @@ -1,10 +1,11 @@ package com.turkcell.gelecegiyazanlar.activities; import android.content.DialogInterface; +import android.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.content.res.ResourcesCompat; import android.support.v4.view.ViewPager; import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; @@ -14,23 +15,23 @@ import com.splunk.mint.Mint; import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.ActivityAramaBinding; import com.turkcell.gelecegiyazanlar.fragments.AramaFragment; import com.turkcell.gelecegiyazanlar.fragments.IcerikAramaFragment; public class AramaActivity extends AppCompatActivity { - public TabLayout tabs; - - ViewPager pager; + private ActivityAramaBinding activityAramaBinding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_arama); + + activityAramaBinding = DataBindingUtil.setContentView(this, R.layout.activity_arama); Mint.initAndStartSession(AramaActivity.this, GYConfiguration.SPLUNK_ID); - Toolbar toolbar = (Toolbar) findViewById(R.id.tool_bar_ara); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbarAramaActivity); setSupportActionBar(toolbar); @@ -50,9 +51,7 @@ public void onClick(DialogInterface arg0, int arg1) { alertDialog.show(); } - - pager = (ViewPager) findViewById(R.id.pagerArama); - pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { + activityAramaBinding.viewPagerPagerAramaActivity.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { managePageChanged(); @@ -69,20 +68,17 @@ public void onPageScrollStateChanged(int state) { } }); MyPagerAdapter pagerAdapter = new MyPagerAdapter(getSupportFragmentManager()); - pager.setAdapter(pagerAdapter); + activityAramaBinding.viewPagerPagerAramaActivity.setAdapter(pagerAdapter); + activityAramaBinding.tabLayoutTabsAramaActivity.setTabsFromPagerAdapter(pagerAdapter); - tabs = (TabLayout) findViewById(R.id.tabsArama); - tabs.setTabsFromPagerAdapter(pagerAdapter); - - tabs.setupWithViewPager(pager); + activityAramaBinding.tabLayoutTabsAramaActivity.setupWithViewPager(activityAramaBinding.viewPagerPagerAramaActivity); getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); - - toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.left_back)); + toolbar.setNavigationIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.left_back, null)); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -92,7 +88,7 @@ public void onClick(View v) { } public Fragment getCurrentFragment() { - Fragment page = getSupportFragmentManager().findFragmentByTag("android:switcher:" + R.id.pagerArama + ":" + pager.getCurrentItem()); + Fragment page = getSupportFragmentManager().findFragmentByTag("android:switcher:" + R.id.viewPagerPagerAramaActivity + ":" + activityAramaBinding.viewPagerPagerAramaActivity.getCurrentItem()); return page; } @@ -102,7 +98,7 @@ private void managePageChanged() { aramaFragment.onPageActivated(); } - public static interface IArama { + public interface IArama { void onPageActivated(); } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/activities/BlogIcerikAcitivity.java b/src/main/java/com/turkcell/gelecegiyazanlar/activities/BlogIcerikAcitivity.java index 0d41da9..a2f98cc 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/activities/BlogIcerikAcitivity.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/activities/BlogIcerikAcitivity.java @@ -1,6 +1,7 @@ package com.turkcell.gelecegiyazanlar.activities; import android.content.Intent; +import android.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; @@ -8,7 +9,6 @@ import android.view.View; import android.webkit.WebView; import android.webkit.WebViewClient; -import android.widget.TextView; import android.widget.Toast; import com.android.volley.Request; @@ -20,6 +20,7 @@ import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.ActivityBlogIcerikAcitivityBinding; import com.turkcell.gelecegiyazanlar.models.Blog; import com.turkcell.gelecegiyazanlar.models.Kisi; import com.turkcell.gelecegiyazanlar.models.Yorum; @@ -28,110 +29,96 @@ import org.json.JSONArray; import org.json.JSONException; -import de.hdodenhof.circleimageview.CircleImageView; - public class BlogIcerikAcitivity extends AppCompatActivity { - String url; - String avatar = ""; - ImageRequest imageRequest; - JsonArrayRequest stringRequest; - String txtBaslik = ""; - YuklenmeEkran ekran; - String nodeID; - CircleImageView circleImageView; + private ActivityBlogIcerikAcitivityBinding activityBlogIcerikAcitivityBinding; - TextView yazar, yazarID, yorum; + private String urlString; + private ImageRequest imageRequest; + private JsonArrayRequest jsonArrayRequest; + private String baslikString = ""; + private YuklenmeEkran yuklenmeEkran; + private String nodeIDString; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_blog_icerik_acitivity); + + activityBlogIcerikAcitivityBinding = DataBindingUtil.setContentView(this, R.layout.activity_blog_icerik_acitivity); Mint.initAndStartSession(BlogIcerikAcitivity.this, GYConfiguration.SPLUNK_ID); - url = GYConfiguration.getDomain() + "article_content/retrieve?nodeID="; - ekran = new YuklenmeEkran(BlogIcerikAcitivity.this); - yazar = (TextView) findViewById(R.id.yazarIsim); - yazarID = (TextView) findViewById(R.id.yazarID); - yorum = (TextView) findViewById(R.id.txtYorum); + urlString = GYConfiguration.getDomain() + "article_content/retrieve?nodeID="; + yuklenmeEkran = new YuklenmeEkran(BlogIcerikAcitivity.this); Bundle exras = getIntent().getExtras(); - nodeID = exras.getString(Blog.BLOG_ID); - Log.d("xx:", nodeID); + nodeIDString = exras.getString(Blog.BLOG_ID); - yorum.setOnClickListener(new View.OnClickListener() { + activityBlogIcerikAcitivityBinding.textViewYorumBlogIcerikActivity.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Intent i = new Intent(BlogIcerikAcitivity.this, YorumActivity.class); - i.putExtra(Yorum.YORUM_ID, nodeID); + i.putExtra(Yorum.YORUM_ID, nodeIDString); startActivity(i); } }); if (GYConfiguration.checkInternetConnectionShowDialog(BlogIcerikAcitivity.this)) { - ekran.surecBasla(); + yuklenmeEkran.surecBasla(); } - stringRequest = new JsonArrayRequest(Request.Method.GET, url + nodeID, null, new Response.Listener() { + jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, urlString + nodeIDString, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { - Log.d("json:", response.toString()); - WebView webView = (WebView) findViewById(R.id.blogDetay); - webView.getSettings().setJavaScriptEnabled(true); - ekran.surecDurdur(); - try { + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setJavaScriptEnabled(true); + yuklenmeEkran.surecDurdur(); + try { //Blog bal balang - TextView baslik = (TextView) findViewById(R.id.txtBaslik); - txtBaslik = response.getJSONObject(0).getString("title"); - baslik.setText(txtBaslik); + baslikString = response.getJSONObject(0).getString("title"); + activityBlogIcerikAcitivityBinding.textViewBaslikBlogIcerikActivity.setText(baslikString); String yazarIsim = response.getJSONObject(0).getString("adSoyad"); String authorID = response.getJSONObject(0).getString("authorID"); - yazar.setText(yazarIsim); - yazarID.setText(authorID); + activityBlogIcerikAcitivityBinding.textViewYazarIsimBlogIcerikActivity.setText(yazarIsim); + activityBlogIcerikAcitivityBinding.textViewYazarIDBlogIcerikActivity.setText(authorID); //Avatar balang - circleImageView = (CircleImageView) findViewById(R.id.avatar); - avatar = response.getJSONObject(0).getString("authorAvatarUrl"); - AvatarYukle(avatar); - //Avatar biti + AvatarYukle(response.getJSONObject(0).getString("authorAvatarUrl")); + //Avatar biti - webView.setWebViewClient(new WebViewClient() { + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.setWebViewClient(new WebViewClient() { @Override public void onPageFinished(WebView view, String url) { super.onPageFinished(view, url); - //Toast.makeText(getApplicationContext(), "Sayfa yklendi", Toast.LENGTH_SHORT).show(); - } public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) { - Toast.makeText(getApplicationContext(),R.string.hata_olustu_mesaji, Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), R.string.hata_olustu_mesaji, Toast.LENGTH_SHORT).show(); } }); //Blog ierik balang - webView.getSettings().setBuiltInZoomControls(true); //zoom yaplmasna izin verir - webView.getSettings().setSupportZoom(true); - webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); - webView.getSettings().setAllowFileAccess(true); - webView.getSettings().setDomStorageEnabled(true); - webView.getSettings().setJavaScriptEnabled(true); - webView.getSettings().setUseWideViewPort(true); - webView.getSettings().setLoadWithOverviewMode(true); - webView.getSettings().setDefaultFontSize(40); + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setBuiltInZoomControls(true); //zoom yaplmasna izin verir + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setSupportZoom(true); + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setAllowFileAccess(true); + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setDomStorageEnabled(true); + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setJavaScriptEnabled(true); + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setUseWideViewPort(true); + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setLoadWithOverviewMode(true); + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.getSettings().setDefaultFontSize(40); Log.d("TAG", response.getJSONObject(0).getString("content")); - webView.loadData(response.getJSONObject(0).getString("content") + activityBlogIcerikAcitivityBinding.webViewBlogDetayBlogIcerikActivity.loadData(response.getJSONObject(0).getString("content") , "text/html; charset=utf-8", null); //Blog ierik biti @@ -149,7 +136,7 @@ public void onErrorResponse(VolleyError error) { } }); - AppController.getInstance().addToRequestQueue(stringRequest); + AppController.getInstance().addToRequestQueue(jsonArrayRequest); } @@ -157,7 +144,7 @@ public void AvatarYukle(String avatar) { imageRequest = new ImageRequest(avatar, new Response.Listener() { @Override public void onResponse(Bitmap response) { - circleImageView.setImageBitmap(response); + activityBlogIcerikAcitivityBinding.circleImageViewAvatarBlogIcerikActivity.setImageBitmap(response); } }, 0, 0, null, new Response.ErrorListener() { @Override @@ -168,12 +155,12 @@ public void onErrorResponse(VolleyError error) { AppController.getInstance().addToRequestQueue(imageRequest); - circleImageView.setOnClickListener(new View.OnClickListener() { + activityBlogIcerikAcitivityBinding.circleImageViewAvatarBlogIcerikActivity.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (yazarID.getText() != null) { + if (activityBlogIcerikAcitivityBinding.textViewYazarIDBlogIcerikActivity.getText() != null) { Intent i = new Intent(BlogIcerikAcitivity.this, ProfilActivity.class); - i.putExtra(Kisi.PROFIL_ID, yazarID.getText()); + i.putExtra(Kisi.PROFIL_ID, activityBlogIcerikAcitivityBinding.textViewYazarIDBlogIcerikActivity.getText()); startActivity(i); } } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/activities/EgitimBaslikActivity.java b/src/main/java/com/turkcell/gelecegiyazanlar/activities/EgitimBaslikActivity.java index e933d25..0b04723 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/activities/EgitimBaslikActivity.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/activities/EgitimBaslikActivity.java @@ -3,11 +3,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v4.content.ContextCompat; +import android.support.v4.content.res.ResourcesCompat; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.ExpandableListView; @@ -21,6 +23,7 @@ import com.turkcell.gelecegiyazanlar.adapterlisteners.MyExpandableAdapter; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.ActivityEgitimBaslikBinding; import com.turkcell.gelecegiyazanlar.models.Egitim; import com.turkcell.gelecegiyazanlar.utilities.YuklenmeEkran; @@ -30,44 +33,48 @@ import java.util.ArrayList; -public class EgitimBaslikActivity extends ActionBarActivity { +public class EgitimBaslikActivity extends AppCompatActivity { + + private ActivityEgitimBaslikBinding activityEgitimBaslikBinding; + + private String baslikString; + private String renkString; + private String nodeIDbyKategoriString; + private Toolbar toolbar; + private YuklenmeEkran yuklenmeEkran; + private ArrayList parentItemStringArrayList; + private ArrayList childItemObjectArrayList; + private ArrayList nodeIDGroupStringArrayList; + private ArrayList nodeIDChildObjectArrayList; - String baslik; - String renk; - String nodeIDbyKategori; - Toolbar toolbar; - ExpandableListView expandableList; - YuklenmeEkran yuklenmeEkran; - private ArrayList parentItems; - private ArrayList childItems; - private ArrayList nodeIDGroup; - private ArrayList nodeIDChild; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_egitim_baslik); + + activityEgitimBaslikBinding = DataBindingUtil.setContentView(this, R.layout.activity_egitim_baslik); + Mint.initAndStartSession(EgitimBaslikActivity.this, GYConfiguration.SPLUNK_ID); Bundle i = getIntent().getExtras(); - baslik = i.getString(Egitim.TITLE_TAG); - renk = i.getString(Egitim.COLOR_TAG); - nodeIDbyKategori = i.getString(Egitim.NODE_ID); - toolbar = (Toolbar) findViewById(R.id.tool_bar2); - toolbar.setTitle(baslik); + baslikString = i.getString(Egitim.TITLE_TAG); + renkString = i.getString(Egitim.COLOR_TAG); + nodeIDbyKategoriString = i.getString(Egitim.NODE_ID); + toolbar = (Toolbar) findViewById(R.id.toolbarEgitimBaslikActivity); + toolbar.setTitle(baslikString); setSupportActionBar(toolbar); ActionbarTasarm(); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); - parentItems = new ArrayList(); - childItems = new ArrayList(); - nodeIDGroup = new ArrayList(); - nodeIDChild = new ArrayList(); - toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.backarrow)); + parentItemStringArrayList = new ArrayList(); + childItemObjectArrayList = new ArrayList(); + nodeIDGroupStringArrayList = new ArrayList(); + nodeIDChildObjectArrayList = new ArrayList(); + + toolbar.setNavigationIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.backarrow, null)); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -75,10 +82,8 @@ public void onClick(View v) { } }); - expandableList = (ExpandableListView) findViewById(R.id.list); - - expandableList.setDividerHeight(2); - expandableList.setGroupIndicator(null); + activityEgitimBaslikBinding.expendableListViewListEgitimBaslikActivity.setDividerHeight(2); + activityEgitimBaslikBinding.expendableListViewListEgitimBaslikActivity.setGroupIndicator(null); if (!GYConfiguration.isNetworkAvailable(EgitimBaslikActivity.this)) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); @@ -97,17 +102,17 @@ public void onClick(DialogInterface arg0, int arg1) { } - setKategori(nodeIDbyKategori); + setKategori(nodeIDbyKategoriString); - expandableList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() { + activityEgitimBaslikBinding.expendableListViewListEgitimBaslikActivity.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() { @Override public boolean onGroupClick(ExpandableListView listview, View view, int group_pos, long id) { Intent i = new Intent(EgitimBaslikActivity.this, EgitimIcerikActivity.class); - i.putExtra(Egitim.NODE_ID_EGITIM, nodeIDGroup.get(group_pos)); - i.putExtra(Egitim.NODE_TITLE, baslik); + i.putExtra(Egitim.NODE_ID_EGITIM, nodeIDGroupStringArrayList.get(group_pos)); + i.putExtra(Egitim.NODE_TITLE, baslikString); startActivity(i); return false; } @@ -119,27 +124,23 @@ public boolean onGroupClick(ExpandableListView listview, View view, public void setKategori(final String nodeIDbyKategori) { yuklenmeEkran = new YuklenmeEkran(this); yuklenmeEkran.surecBasla(); - Log.d("xx", GYConfiguration.getDomain() + "egitim_baslik/retrieve?nodeID=" + nodeIDbyKategori); JsonArrayRequest movieReq = new JsonArrayRequest(Request.Method.GET, GYConfiguration.getDomain() + "egitim_baslik/retrieve?nodeID=" + nodeIDbyKategori, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { - Log.d("json:", GYConfiguration.getDomain() + "egitim_baslik/retrieve?nodeID=" + nodeIDbyKategori); - - try { JSONArray belowArray = response.getJSONObject(0).getJSONArray("below"); for (int i = 0; i < belowArray.length(); i++) { String anaBaslik = belowArray.getJSONObject(i).getString("title"); String node = belowArray.getJSONObject(i).getString("nodeID"); - Log.d("title:", anaBaslik + "\n"); - parentItems.add(anaBaslik); - nodeIDGroup.add(node); + + parentItemStringArrayList.add(anaBaslik); + nodeIDGroupStringArrayList.add(node); JSONArray underBelowArray = belowArray.getJSONObject(i).getJSONArray("below"); - Log.d("size:", String.valueOf(underBelowArray.length())); + if (underBelowArray != null) { ArrayList child = new ArrayList(); ArrayList childId = new ArrayList(); @@ -147,31 +148,30 @@ public void onResponse(JSONArray response) { for (int j = 0; j < underBelowArray.length(); j++) { String nodeChild = underBelowArray.getJSONObject(j).getString("nodeID"); - Log.d("childTitle:", underBelowArray.getJSONObject(j).getString("title") + " " + nodeChild + "\n"); + child.add(underBelowArray.getJSONObject(j).getString("title")); childId.add(nodeChild); } - childItems.add(child); - nodeIDChild.add(childId); + childItemObjectArrayList.add(child); + nodeIDChildObjectArrayList.add(childId); } } - MyExpandableAdapter adapter = new MyExpandableAdapter(parentItems, childItems, nodeIDChild, nodeIDGroup); + MyExpandableAdapter adapter = new MyExpandableAdapter(parentItemStringArrayList, childItemObjectArrayList, nodeIDChildObjectArrayList, nodeIDGroupStringArrayList); adapter.setInflater((LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE), EgitimBaslikActivity.this); - expandableList.setAdapter(adapter); + activityEgitimBaslikBinding.expendableListViewListEgitimBaslikActivity.setAdapter(adapter); for (int a = 0; a < adapter.getGroupCount(); a++) - expandableList.expandGroup(a); + activityEgitimBaslikBinding.expendableListViewListEgitimBaslikActivity.expandGroup(a); } catch (JSONException e) { e.printStackTrace(); } yuklenmeEkran.surecDurdur(); - Log.d("size parent:", String.valueOf(parentItems.size())); - Log.d("size parent:", String.valueOf(childItems.size())); + } }, new Response.ErrorListener() { @@ -189,20 +189,20 @@ public void onErrorResponse(VolleyError error) { private void ActionbarTasarm() { - if (renk.equals("android")) { - toolbar.setBackgroundColor(getResources().getColor(R.color.android_yesil_renk)); - } else if (renk.equals("ios")) { - toolbar.setBackgroundColor(getResources().getColor(R.color.ios_siyah_renk)); - } else if (renk.equals("win")) { - toolbar.setBackgroundColor(getResources().getColor(R.color.windows_mavi_renk)); - } else if (renk.equals("web")) { - toolbar.setBackgroundColor(getResources().getColor(R.color.web_renk)); - } else if (renk.equals("app")) { - toolbar.setBackgroundColor(getResources().getColor(R.color.app_inventor_kirmizi_renk)); - } else if (renk.equals("scratch")) { - toolbar.setBackgroundColor(getResources().getColor(R.color.scratch_turuncu_renk)); - } else if (renk.equals("arduino")) { - toolbar.setBackgroundColor(getResources().getColor(R.color.arduino_renk)); + if (renkString.equals("android")) { + toolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.android_yesil_renk)); + } else if (renkString.equals("ios")) { + toolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.ios_siyah_renk)); + } else if (renkString.equals("win")) { + toolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.windows_mavi_renk)); + } else if (renkString.equals("web")) { + toolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.web_renk)); + } else if (renkString.equals("app")) { + toolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.app_inventor_kirmizi_renk)); + } else if (renkString.equals("scratch")) { + toolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.scratch_turuncu_renk)); + } else if (renkString.equals("arduino")) { + toolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.arduino_renk)); } } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/activities/EgitimIcerikActivity.java b/src/main/java/com/turkcell/gelecegiyazanlar/activities/EgitimIcerikActivity.java index baf7b9d..2c66cd2 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/activities/EgitimIcerikActivity.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/activities/EgitimIcerikActivity.java @@ -2,14 +2,13 @@ import android.app.ProgressDialog; import android.content.Intent; +import android.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v4.content.res.ResourcesCompat; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.View; -import android.webkit.WebView; -import android.widget.TextView; import com.android.volley.Response; import com.android.volley.VolleyError; @@ -21,65 +20,71 @@ import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.ActivityEgitimIcerikBinding; import com.turkcell.gelecegiyazanlar.models.Egitim; import com.turkcell.gelecegiyazanlar.models.Kisi; import org.json.JSONArray; import org.json.JSONException; -import de.hdodenhof.circleimageview.CircleImageView; -public class EgitimIcerikActivity extends ActionBarActivity { +public class EgitimIcerikActivity extends AppCompatActivity { + + private ActivityEgitimIcerikBinding activityEgitimIcerikBinding; final Egitim egitim = new Egitim(); - WebView webIcerik; - TextView yazarIsim; - CircleImageView resimAvatar; - String icerikYazi = "", yazarYazi, resimUrl, title; - Toolbar toolbar; - String dugumID, dugumBaslik, authorID; - long time; + + private String icerikYaziString = ""; + private String yazarYaziString; + private String resimUrlString; + private String titleString; + private String dugumIDString; + private String dugumBaslikString; + private String authorIDString; + + private Toolbar toolbar; + + private long timeALong; + private ProgressDialog pDialog; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_egitim_icerik); + + activityEgitimIcerikBinding = DataBindingUtil.setContentView(this, R.layout.activity_egitim_icerik); Mint.initAndStartSession(EgitimIcerikActivity.this, GYConfiguration.SPLUNK_ID); - yazarIsim = (TextView) findViewById(R.id.yazar); - webIcerik = (WebView) findViewById(R.id.web); - resimAvatar = (CircleImageView) findViewById(R.id.profile_image); - webIcerik.getSettings().setJavaScriptEnabled(true); - webIcerik.getSettings().setUseWideViewPort(true); - webIcerik.getSettings().setSupportZoom(true); - webIcerik.getSettings().setDisplayZoomControls(true); - webIcerik.getSettings().setBuiltInZoomControls(true); - webIcerik.getSettings().setDefaultFontSize(40); - - webIcerik.getSettings().setLoadWithOverviewMode(true); - yazarIsim.setOnClickListener(new View.OnClickListener() { + activityEgitimIcerikBinding.webViewWebIcerikEgitimIcerikActivity.getSettings().setJavaScriptEnabled(true); + activityEgitimIcerikBinding.webViewWebIcerikEgitimIcerikActivity.getSettings().setUseWideViewPort(true); + activityEgitimIcerikBinding.webViewWebIcerikEgitimIcerikActivity.getSettings().setSupportZoom(true); + activityEgitimIcerikBinding.webViewWebIcerikEgitimIcerikActivity.getSettings().setDisplayZoomControls(true); + activityEgitimIcerikBinding.webViewWebIcerikEgitimIcerikActivity.getSettings().setBuiltInZoomControls(true); + activityEgitimIcerikBinding.webViewWebIcerikEgitimIcerikActivity.getSettings().setDefaultFontSize(40); + + activityEgitimIcerikBinding.webViewWebIcerikEgitimIcerikActivity.getSettings().setLoadWithOverviewMode(true); + activityEgitimIcerikBinding.textViewYazarIsimEgitimIcerikActivity.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Intent i = new Intent(EgitimIcerikActivity.this, ProfilActivity.class); - i.putExtra(Kisi.PROFIL_ID, authorID); + i.putExtra(Kisi.PROFIL_ID, authorIDString); startActivity(i); } }); - toolbar = (Toolbar) findViewById(R.id.tool_bar2); + toolbar = (Toolbar) findViewById(R.id.toolbarEgitimIcerikActivity); setSupportActionBar(toolbar); Bundle extras = getIntent().getExtras(); - dugumID = extras.getString(Egitim.NODE_ID_EGITIM); - dugumBaslik = extras.getString(Egitim.NODE_TITLE); + dugumIDString = extras.getString(Egitim.NODE_ID_EGITIM); + dugumBaslikString = extras.getString(Egitim.NODE_TITLE); getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); - toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.backarrow)); + toolbar.setNavigationIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.backarrow, null)); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -88,49 +93,47 @@ public void onClick(View v) { }); if (GYConfiguration.checkInternetConnectionShowDialog(EgitimIcerikActivity.this)) { - getEgitimIcerik(dugumID); + getEgitimIcerik(dugumIDString); } } - public void getEgitimIcerik(final String dugumID) { pDialog = new ProgressDialog(this); pDialog.setMessage(getString(R.string.yukleniyor)); pDialog.show(); - Log.d("icerik:", GYConfiguration.getDomain() + "book_content/retrieve?nodeID=" + dugumID); + JsonArrayRequest movieReq = new JsonArrayRequest(GYConfiguration.getDomain() + "book_content/retrieve?nodeID=" + dugumID, new Response.Listener() { @Override public void onResponse(JSONArray response) { - Log.d("json:", GYConfiguration.getDomain() + "book_content/retrieve?nodeID=" + dugumID); - hidePDialog(); + hidePDialog(); try { JSONArray icerikDizi = response.getJSONObject(0).getJSONArray("content"); - yazarYazi = response.getJSONObject(0).getString("adSoyad"); - title = response.getJSONObject(0).getString("title"); - resimUrl = response.getJSONObject(0).getString("authorAvatarUrl"); - authorID = response.getJSONObject(0).getString("authorID"); - Log.d("icerikDiziUzunluk:", String.valueOf(icerikDizi.length())); + yazarYaziString = response.getJSONObject(0).getString("adSoyad"); + titleString = response.getJSONObject(0).getString("title"); + resimUrlString = response.getJSONObject(0).getString("authorAvatarUrl"); + authorIDString = response.getJSONObject(0).getString("authorID"); + for (int i = 0; i < icerikDizi.length(); i++) { - icerikYazi += icerikDizi.getString(i); + icerikYaziString += icerikDizi.getString(i); } - egitim.setIcerik(icerikYazi); - egitim.setYazar(yazarYazi); - toolbar.setTitle(title); + egitim.setIcerik(icerikYaziString); + egitim.setYazar(yazarYaziString); + toolbar.setTitle(titleString); - if (yazarYazi != null || icerikYazi != null) { + if (yazarYaziString != null || icerikYaziString != null) { ResimGetir(); - yazarIsim.setText(egitim.getYazar()); - webIcerik.loadDataWithBaseURL("", egitim.getIcerik(), "text/html", "UTF-8", ""); + activityEgitimIcerikBinding.textViewYazarIsimEgitimIcerikActivity.setText(egitim.getYazar()); + activityEgitimIcerikBinding.webViewWebIcerikEgitimIcerikActivity.loadDataWithBaseURL("", egitim.getIcerik(), "text/html", "UTF-8", ""); } - CurioClient.getInstance(getApplicationContext()).sendEvent("Egitim erik>" + dugumBaslik, title); - time = System.currentTimeMillis(); + CurioClient.getInstance(getApplicationContext()).sendEvent("Egitim erik>" + dugumBaslikString, titleString); + timeALong = System.currentTimeMillis(); } catch (JSONException e) { e.printStackTrace(); } @@ -140,14 +143,13 @@ public void onResponse(JSONArray response) { @Override public void onErrorResponse(VolleyError error) { VolleyLog.d("Error", "Error: " + error.getMessage()); - Log.d("json:", "Giris Yapilamadi"); hidePDialog(); } }); AppController.getInstance().addToRequestQueue(movieReq); - Log.d("tite", title + dugumBaslik); + } @@ -159,10 +161,10 @@ private void hidePDialog() { } public void ResimGetir() { - ImageRequest image = new ImageRequest(resimUrl, new Response.Listener() { + ImageRequest image = new ImageRequest(resimUrlString, new Response.Listener() { @Override public void onResponse(Bitmap response) { - resimAvatar.setImageBitmap(response); + activityEgitimIcerikBinding.circleImageViewProfileImageEgitimIcerikActivity.setImageBitmap(response); } }, 0, 0, null, new Response.ErrorListener() { @Override @@ -182,7 +184,7 @@ protected void onStart() { @Override protected void onStop() { super.onStop(); - CurioClient.getInstance(getApplicationContext()).endEvent("Egitim erik>" + dugumBaslik, title, System.currentTimeMillis() - time); + CurioClient.getInstance(getApplicationContext()).endEvent("Egitim erik>" + dugumBaslikString, titleString, System.currentTimeMillis() - timeALong); } } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/activities/EtkinlikIcerikActivity.java b/src/main/java/com/turkcell/gelecegiyazanlar/activities/EtkinlikIcerikActivity.java index 424cdbc..1a9da93 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/activities/EtkinlikIcerikActivity.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/activities/EtkinlikIcerikActivity.java @@ -1,8 +1,10 @@ package com.turkcell.gelecegiyazanlar.activities; import android.content.Intent; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.View; @@ -19,6 +21,7 @@ import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.ActivityEtkinlikIcerikBinding; import com.turkcell.gelecegiyazanlar.models.Etkinlik; import com.turkcell.gelecegiyazanlar.models.Yorum; import com.turkcell.gelecegiyazanlar.utilities.YuklenmeEkran; @@ -26,94 +29,89 @@ import org.json.JSONArray; import org.json.JSONException; -public class EtkinlikIcerikActivity extends ActionBarActivity { +public class EtkinlikIcerikActivity extends AppCompatActivity { - String url; - JsonArrayRequest stringRequest; - String txtBaslik = ""; - TextView title, yorum; - String id; + private ActivityEtkinlikIcerikBinding activityEtkinlikIcerikBinding; + + private String urlString; + private JsonArrayRequest jsonArrayRequest; + private String baslikString = ""; + private String idString; + + private YuklenmeEkran yuklenmeEkran; - YuklenmeEkran ekran; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_etkinlik_icerik); - Mint.initAndStartSession(EtkinlikIcerikActivity.this, GYConfiguration.SPLUNK_ID); + activityEtkinlikIcerikBinding = DataBindingUtil.setContentView(this, R.layout.activity_etkinlik_icerik); - ekran = new YuklenmeEkran(EtkinlikIcerikActivity.this); + Mint.initAndStartSession(EtkinlikIcerikActivity.this, GYConfiguration.SPLUNK_ID); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbaretkinlik); - title = (TextView) toolbar.findViewById(R.id.txtBaslik); - yorum = (TextView) toolbar.findViewById(R.id.txtYorum); + yuklenmeEkran = new YuklenmeEkran(EtkinlikIcerikActivity.this); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbarEtkinlikIcerikActivity); - url = GYConfiguration.getDomain() + "etkinlik_content/retrieve?nodeID="; + urlString = GYConfiguration.getDomain() + "etkinlik_content/retrieve?nodeID="; Bundle extras = getIntent().getExtras(); - id = extras.getString(Etkinlik.ETKINLIK_ID); + idString = extras.getString(Etkinlik.ETKINLIK_ID); - yorum.setOnClickListener(new View.OnClickListener() { + activityEtkinlikIcerikBinding.textViewYorumEtkinlikIcerikActivity.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Intent i = new Intent(EtkinlikIcerikActivity.this, YorumActivity.class); - i.putExtra(Yorum.YORUM_ID, id); + i.putExtra(Yorum.YORUM_ID, idString); startActivity(i); } }); - Log.d("tag", url + id); if (GYConfiguration.checkInternetConnectionShowDialog(EtkinlikIcerikActivity.this)) { - ekran.surecBasla(); + yuklenmeEkran.surecBasla(); } - stringRequest = new JsonArrayRequest(Request.Method.GET, url + id, null, new Response.Listener() { + jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, urlString + idString, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { - Log.d("json:", response.toString()); - WebView webView = (WebView) findViewById(R.id.etkinlikDetay); - webView.getSettings().setJavaScriptEnabled(true); - try { + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setJavaScriptEnabled(true); - webView.setWebViewClient(new WebViewClient() { + try { + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.setWebViewClient(new WebViewClient() { @Override public void onPageFinished(WebView view, String url) { super.onPageFinished(view, url); - //Toast.makeText(getApplicationContext(), "Sayfa yklendi", Toast.LENGTH_SHORT).show(); - ekran.surecDurdur(); + yuklenmeEkran.surecDurdur(); } public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) { Toast.makeText(getApplicationContext(), R.string.hata_olustu_mesaji, Toast.LENGTH_SHORT).show(); - ekran.surecDurdur(); + yuklenmeEkran.surecDurdur(); } }); - txtBaslik = response.getJSONObject(0).getString("title"); - title.setText(txtBaslik); + baslikString = response.getJSONObject(0).getString("title"); + activityEtkinlikIcerikBinding.textViewBaslikEtkinlikIcerikActivity.setText(baslikString); //Etkinlik bal biti - webView.getSettings().setBuiltInZoomControls(true); //zoom yaplmasna izin verir - webView.getSettings().setSupportZoom(true); - webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); - webView.getSettings().setAllowFileAccess(true); - webView.getSettings().setDomStorageEnabled(true); - webView.getSettings().setJavaScriptEnabled(true); - webView.getSettings().setUseWideViewPort(true); - webView.getSettings().setLoadWithOverviewMode(true); - webView.getSettings().setDefaultFontSize(40); - + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setBuiltInZoomControls(true); //zoom yaplmasna izin verir + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setSupportZoom(true); + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setAllowFileAccess(true); + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setDomStorageEnabled(true); + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setJavaScriptEnabled(true); + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setUseWideViewPort(true); + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setLoadWithOverviewMode(true); + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.getSettings().setDefaultFontSize(40); //Etkinlik ierik balang - webView.loadData(response.getJSONObject(0).getString("content") + activityEtkinlikIcerikBinding.webViewEtkinlikDetayEtkinlikIcerikActivity.loadData(response.getJSONObject(0).getString("content") , "text/html; charset=utf-8", null); //Etkinlik ierik biti @@ -131,7 +129,7 @@ public void onErrorResponse(VolleyError error) { } }); - AppController.getInstance().addToRequestQueue(stringRequest); + AppController.getInstance().addToRequestQueue(jsonArrayRequest); } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/activities/MainActivity.java b/src/main/java/com/turkcell/gelecegiyazanlar/activities/MainActivity.java index 9ac4b5b..7bfce5d 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/activities/MainActivity.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/activities/MainActivity.java @@ -2,19 +2,17 @@ import android.content.Intent; import android.content.res.Configuration; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v4.app.FragmentManager; -import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.Gravity; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; -import android.widget.ListView; import android.widget.TextView; import com.splunk.mint.Mint; @@ -22,6 +20,7 @@ import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.adapterlisteners.ListDrawerAdapter; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.ActivityMainBinding; import com.turkcell.gelecegiyazanlar.fragments.BlogFragment; import com.turkcell.gelecegiyazanlar.fragments.EgitimFragment; import com.turkcell.gelecegiyazanlar.fragments.ElcilerFragment; @@ -33,35 +32,36 @@ public class MainActivity extends AppCompatActivity { + private ActivityMainBinding activityMainBinding; + private static int save = -1; - android.support.v7.widget.Toolbar toolbar; - String mTitle; - ArrayList drawerList = new ArrayList<>(); + private Toolbar toolbar; + private String mTitleString; + private ArrayList drawerItemsArrayList = new ArrayList<>(); TextView textView; - private DrawerLayout drawerLayout; private ActionBarDrawerToggle drawerToggle; - private ListView leftDrawerList; private ListDrawerAdapter navigationDrawerAdapter; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - mTitle=getResources().getString(R.string.sayfa_baslik_gelecegi_yazanlar); + + activityMainBinding = DataBindingUtil.setContentView(this, R.layout.activity_main); + + mTitleString = getResources().getString(R.string.sayfa_baslik_gelecegi_yazanlar); + Mint.initAndStartSession(MainActivity.this, GYConfiguration.SPLUNK_ID); CurioClient.getInstance(this).getPushData(getIntent()); CurioClient.getInstance(this).startSession(); - toolbar = (Toolbar) findViewById(R.id.tool_bar); + toolbar = (Toolbar) findViewById(R.id.toolbarMainActivity); setSupportActionBar(toolbar); getSupportActionBar().setElevation(0); getSupportActionBar().setDisplayShowTitleEnabled(false); - textView = (TextView) findViewById(R.id.titleCenter); - textView.setText(mTitle); - - Log.d("conf", GYConfiguration.getDomain()); + textView = (TextView) findViewById(R.id.textViewTitle); + textView.setText(mTitleString); //Liste doldurma metodumuz Yukle(); @@ -69,16 +69,13 @@ protected void onCreate(Bundle savedInstanceState) { // Balang ekran fragment FragmentManager ft = getSupportFragmentManager(); ft.beginTransaction() - .replace(R.id.fragment, new EgitimFragment()) + .replace(R.id.fragmentMainActivity, new EgitimFragment()) .commit(); - - //Men Listesi Oluturma - leftDrawerList = (ListView) findViewById(R.id.left_drawer); - drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout); - navigationDrawerAdapter = new ListDrawerAdapter(drawerList); - leftDrawerList.setAdapter(navigationDrawerAdapter); + + navigationDrawerAdapter = new ListDrawerAdapter(drawerItemsArrayList); + activityMainBinding.listViewLeftlistMainActivity.setAdapter(navigationDrawerAdapter); initDrawer(); GYConfiguration.checkInternetConnectionShowDialog(MainActivity.this); @@ -86,10 +83,10 @@ protected void onCreate(Bundle savedInstanceState) { /** * liste itemlarna tklanma ve gei iin kullanlan ksm. */ - leftDrawerList.setOnItemClickListener(new AdapterView.OnItemClickListener() { + activityMainBinding.listViewLeftlistMainActivity.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - drawerLayout.closeDrawers(); + activityMainBinding.drawerLayoutMainActivity.closeDrawers(); parent.getChildAt(position).setBackgroundColor(getResources().getColor(R.color.drawer_secilen_renk)); @@ -99,39 +96,37 @@ public void onItemClick(AdapterView parent, View view, int position, long id) save = position; - // view.setBackgroundColor(getResources().getColor(R.color.drawer_color_selected)); - FragmentManager ft = getSupportFragmentManager(); switch (position) { case 0: - mTitle = getString(R.string.sayfa_baslik_egitim); + mTitleString = getString(R.string.sayfa_baslik_egitim); ft.beginTransaction() - .replace(R.id.fragment, new EgitimFragment()) + .replace(R.id.fragmentMainActivity, new EgitimFragment()) .commit(); view.setBackgroundColor(getResources().getColor(R.color.drawer_secilen_renk)); break; case 1: - mTitle = getString(R.string.sayfa_baslik_blog); + mTitleString = getString(R.string.sayfa_baslik_blog); ft.beginTransaction() - .replace(R.id.fragment, new BlogFragment()) + .replace(R.id.fragmentMainActivity, new BlogFragment()) .commit(); view.setBackgroundColor(getResources().getColor(R.color.drawer_secilen_renk)); break; case 2: - mTitle = getString(R.string.sayfa_baslik_etkinlik); + mTitleString = getString(R.string.sayfa_baslik_etkinlik); ft.beginTransaction() - .replace(R.id.fragment, new EtkinlikFragment()) + .replace(R.id.fragmentMainActivity, new EtkinlikFragment()) .commit(); view.setBackgroundColor(getResources().getColor(R.color.drawer_secilen_renk)); break; case 3: - mTitle = getString(R.string.sayfa_baslik_gelistirici); + mTitleString = getString(R.string.sayfa_baslik_gelistirici); ft.beginTransaction() - .replace(R.id.fragment, new ElcilerFragment()) + .replace(R.id.fragmentMainActivity, new ElcilerFragment()) .commit(); view.setBackgroundColor(getResources().getColor(R.color.drawer_secilen_renk)); break; @@ -139,14 +134,14 @@ public void onItemClick(AdapterView parent, View view, int position, long id) view.setBackgroundColor(getResources().getColor(android.R.color.white)); break; } - textView.setText(mTitle); + textView.setText(mTitleString); } }); } private void initDrawer() { - drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.drawer_open, R.string.drawer_close) { + drawerToggle = new ActionBarDrawerToggle(this, activityMainBinding.drawerLayoutMainActivity, toolbar, R.string.drawer_open, R.string.drawer_close) { @Override public void onDrawerClosed(View drawerView) { @@ -160,7 +155,7 @@ public void onDrawerOpened(View drawerView) { } }; - drawerLayout.setDrawerListener(drawerToggle); + activityMainBinding.drawerLayoutMainActivity.setDrawerListener(drawerToggle); } @Override @@ -188,7 +183,6 @@ public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); - //noinspection SimplifiableIfStatement if (id == R.id.action_settings) { Intent i = new Intent(MainActivity.this, AramaActivity.class); startActivity(i); @@ -203,16 +197,16 @@ public boolean onOptionsItemSelected(MenuItem item) { * Liste elemanlarn doldurduk. */ public void Yukle() { - drawerList.add(new DrawerItems(R.drawable.egitimicon, getString(R.string.sol_menu_egitim))); - drawerList.add(new DrawerItems(R.drawable.blogicon, getString(R.string.sol_menu_blog))); - drawerList.add(new DrawerItems(R.drawable.etkinlikicon, getString(R.string.sol_menu_etkinlik))); - drawerList.add(new DrawerItems(R.drawable.gelistiriciicon, getString(R.string.sol_menu_gelistirici))); + drawerItemsArrayList.add(new DrawerItems(R.drawable.egitimicon, getString(R.string.sol_menu_egitim))); + drawerItemsArrayList.add(new DrawerItems(R.drawable.blogicon, getString(R.string.sol_menu_blog))); + drawerItemsArrayList.add(new DrawerItems(R.drawable.etkinlikicon, getString(R.string.sol_menu_etkinlik))); + drawerItemsArrayList.add(new DrawerItems(R.drawable.gelistiriciicon, getString(R.string.sol_menu_gelistirici))); } @Override public void onBackPressed() { - if (drawerLayout.isDrawerOpen(Gravity.LEFT)) { - drawerLayout.closeDrawers(); + if (activityMainBinding.drawerLayoutMainActivity.isDrawerOpen(Gravity.LEFT)) { + activityMainBinding.drawerLayoutMainActivity.closeDrawers(); } else { super.onBackPressed(); } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/activities/ProfilActivity.java b/src/main/java/com/turkcell/gelecegiyazanlar/activities/ProfilActivity.java index 0831dec..a48cd60 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/activities/ProfilActivity.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/activities/ProfilActivity.java @@ -1,49 +1,51 @@ package com.turkcell.gelecegiyazanlar.activities; +import android.databinding.DataBindingUtil; import android.os.Bundle; +import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewPager; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import com.splunk.mint.Mint; import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.adapterlisteners.ViewPagerAdapterProfil; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.ActivityProfilBinding; import com.turkcell.gelecegiyazanlar.designs.SlidingTabLayout; -public class ProfilActivity extends ActionBarActivity { +public class ProfilActivity extends AppCompatActivity { - public SlidingTabLayout tabs; - CharSequence titles[]; - int tabSayisi = 2; + private ActivityProfilBinding activityProfilBinding; - ViewPager pager; - ViewPagerAdapterProfil adapter; + private CharSequence titleCharSequences[]; + private int tabSayisiAnInt = 2; + + private ViewPagerAdapterProfil viewPagerAdapterProfil; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_profil); + + activityProfilBinding = DataBindingUtil.setContentView(this, R.layout.activity_profil); + Mint.initAndStartSession(ProfilActivity.this, GYConfiguration.SPLUNK_ID); - Toolbar toolbar = (Toolbar) findViewById(R.id.tool_bar_back); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbarProfilActivity); setSupportActionBar(toolbar); - - titles = new CharSequence[]{getString(R.string.profil_baslik_hakkinda), + titleCharSequences = new CharSequence[]{getString(R.string.profil_baslik_hakkinda), getString(R.string.profil_baslik_basari_belgeleri)}; - adapter = new ViewPagerAdapterProfil(getSupportFragmentManager(), titles, tabSayisi); - - pager = (ViewPager) findViewById(R.id.pagerProfil); - pager.setAdapter(adapter); + viewPagerAdapterProfil = new ViewPagerAdapterProfil(getSupportFragmentManager(), titleCharSequences, tabSayisiAnInt); + activityProfilBinding.viewPagerPagerProfilActivity.setAdapter(viewPagerAdapterProfil); - tabs = (SlidingTabLayout) findViewById(R.id.tabsBlog); - tabs.setDistributeEvenly(true); // tablar?n d?zenlenebilir olmas?n? sa?lar - tabs.setSelectedIndicatorColors(getResources().getColor(R.color.beyaz_renk)); + activityProfilBinding.slidingTabLayoutTabsProfilActivity.setDistributeEvenly(true); + activityProfilBinding.slidingTabLayoutTabsProfilActivity.setSelectedIndicatorColors(ContextCompat.getColor(getApplicationContext(), R.color.beyaz_renk)); - tabs.setViewPager(pager); + activityProfilBinding.slidingTabLayoutTabsProfilActivity.setViewPager(activityProfilBinding.viewPagerPagerProfilActivity); } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/activities/YorumActivity.java b/src/main/java/com/turkcell/gelecegiyazanlar/activities/YorumActivity.java index 8b95c1b..e55a069 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/activities/YorumActivity.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/activities/YorumActivity.java @@ -1,7 +1,9 @@ package com.turkcell.gelecegiyazanlar.activities; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.ListView; @@ -16,6 +18,7 @@ import com.turkcell.gelecegiyazanlar.adapterlisteners.ListViewAdapterYorum; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.ActivityYorumBinding; import com.turkcell.gelecegiyazanlar.models.Yorum; import com.turkcell.gelecegiyazanlar.utilities.TarihCevir; import com.turkcell.gelecegiyazanlar.utilities.YuklenmeEkran; @@ -26,40 +29,36 @@ import java.util.ArrayList; import java.util.List; -public class YorumActivity extends ActionBarActivity { +public class YorumActivity extends AppCompatActivity { + private ActivityYorumBinding activityYorumBinding; - final List yorumlar = new ArrayList(); - String url; + final List yorumList = new ArrayList(); + private String urlString; - String nodeID; - JsonArrayRequest request; - String icon; - TextView yorumYok; + private String nodeIDString; + private JsonArrayRequest jsonArrayRequest; + private String iconString; - ListView listemiz; - - YuklenmeEkran ekran; - TarihCevir tarihCevir; + private YuklenmeEkran yuklenmeEkran; + private TarihCevir tarihCevir; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_yorum); - Mint.initAndStartSession(YorumActivity.this, GYConfiguration.SPLUNK_ID); - url = GYConfiguration.getDomain() + "yorumlar/retrieve?nodeID="; - ekran = new YuklenmeEkran(this); - tarihCevir = new TarihCevir(); + activityYorumBinding = DataBindingUtil.setContentView(this, R.layout.activity_yorum); - listemiz = (ListView) findViewById(R.id.liste); + Mint.initAndStartSession(YorumActivity.this, GYConfiguration.SPLUNK_ID); + urlString = GYConfiguration.getDomain() + "yorumlar/retrieve?nodeID="; - yorumYok = (TextView) findViewById(R.id.yorumyok); + yuklenmeEkran = new YuklenmeEkran(this); + tarihCevir = new TarihCevir(); Bundle bundle = getIntent().getExtras(); - nodeID = bundle.getString(Yorum.YORUM_ID); + nodeIDString = bundle.getString(Yorum.YORUM_ID); - Goruntule(nodeID); + Goruntule(nodeIDString); } @@ -67,30 +66,27 @@ protected void onCreate(Bundle savedInstanceState) { public void Goruntule(String nodeid) { - ekran.surecBasla(); - request = new JsonArrayRequest(Request.Method.GET, url + nodeid, null, new Response.Listener() { + yuklenmeEkran.surecBasla(); + jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, urlString + nodeid, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { - ekran.surecDurdur(); + yuklenmeEkran.surecDurdur(); try { if (response.length() == 0) { - yorumYok.setVisibility(View.VISIBLE); + activityYorumBinding.textViewYorumyokYorumActivity.setVisibility(View.VISIBLE); } else { for (int i = 0; i < response.length(); i++) { String isimsoyisim = response.getJSONObject(i).getString("adSoyad"); String yorum = response.getJSONObject(i).getString("content"); - icon = response.getJSONObject(i).getString("authorAvatarUrl"); + iconString = response.getJSONObject(i).getString("authorAvatarUrl"); String tarihVeri = response.getJSONObject(i).getString("date"); String authorID = response.getJSONObject(i).getString("authorID"); - Log.d("TAG:", icon); - - //add to - yorumlar.add(new Yorum(isimsoyisim, yorum, icon, tarihCevir.Cevir(tarihVeri), authorID)); + yorumList.add(new Yorum(isimsoyisim, yorum, iconString, tarihCevir.Cevir(tarihVeri), authorID)); } @@ -99,8 +95,8 @@ public void onResponse(JSONArray response) { } catch (JSONException e) { e.printStackTrace(); } - ListViewAdapterYorum adaptorumuz = new ListViewAdapterYorum(YorumActivity.this, yorumlar); - listemiz.setAdapter(adaptorumuz); + ListViewAdapterYorum listViewAdapterYorum = new ListViewAdapterYorum(YorumActivity.this, yorumList); + activityYorumBinding.listViewListeYorumActivity.setAdapter(listViewAdapterYorum); } @@ -115,7 +111,7 @@ public void onErrorResponse(VolleyError error) { }); - AppController.getInstance().addToRequestQueue(request); + AppController.getInstance().addToRequestQueue(jsonArrayRequest); } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/animations/DerinSayfaDegisimi.java b/src/main/java/com/turkcell/gelecegiyazanlar/animations/DerinSayfaDegisimi.java index 8f7ee68..6df363b 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/animations/DerinSayfaDegisimi.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/animations/DerinSayfaDegisimi.java @@ -5,7 +5,7 @@ /** * Bu snftaki kodlar http://developer.android.com/intl/es/training/animation/screen-slide.html sitesinden - * alnmtr + * alnmtr */ public class DerinSayfaDegisimi implements ViewPager.PageTransformer { private static float MIN_SCALE = 0.75f; diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/configurations/GYConfiguration.java b/src/main/java/com/turkcell/gelecegiyazanlar/configurations/GYConfiguration.java index 295e076..b47e58b 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/configurations/GYConfiguration.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/configurations/GYConfiguration.java @@ -12,7 +12,7 @@ enum Domain { TESTOZGUR, TESTTURKCELL, PRP, PROD -}; +} public class GYConfiguration { @@ -75,7 +75,6 @@ public static boolean checkInternetConnectionShowDialog(Activity activity) { } - } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/designs/SlidingTabLayoutIcon.java b/src/main/java/com/turkcell/gelecegiyazanlar/designs/SlidingTabLayoutIcon.java index a6c7a1e..c49de45 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/designs/SlidingTabLayoutIcon.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/designs/SlidingTabLayoutIcon.java @@ -117,7 +117,7 @@ protected ImageView createDefaultImageView(Context context) { imageView.setPadding(padding - 8, padding, padding - 8, padding); - int width = (int) (getResources().getDisplayMetrics().widthPixels / mViewPager.getAdapter().getCount()); + int width = getResources().getDisplayMetrics().widthPixels / mViewPager.getAdapter().getCount(); imageView.setMinimumWidth(width - 120); return imageView; diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/AramaFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/AramaFragment.java index b47937f..6212810 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/AramaFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/AramaFragment.java @@ -2,36 +2,33 @@ import android.content.Context; import android.content.Intent; +import android.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.EditText; import android.widget.ImageView; -import android.widget.ListView; import android.widget.TextView; import com.android.volley.Request; -import com.android.volley.RequestQueue; import com.android.volley.Response; import com.android.volley.VolleyError; -import com.android.volley.toolbox.ImageRequest; import com.android.volley.toolbox.JsonArrayRequest; -import com.android.volley.toolbox.JsonObjectRequest; import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.activities.AramaActivity; import com.turkcell.gelecegiyazanlar.activities.ProfilActivity; import com.turkcell.gelecegiyazanlar.adapterlisteners.KullaniciAramaAdapter; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; -import com.turkcell.gelecegiyazanlar.models.Icerik; +import com.turkcell.gelecegiyazanlar.databinding.FragmentAramaBinding; import com.turkcell.gelecegiyazanlar.models.Kisi; import com.turkcell.gelecegiyazanlar.utilities.YuklenmeEkran; @@ -44,33 +41,16 @@ public class AramaFragment extends Fragment implements View.OnClickListener, AramaActivity.IArama { - EditText search; + private FragmentAramaBinding fragmentAramaBinding; - ImageView btnAra; - ListView listView; - TextView tvSonuc; - - Kisi tempKisi; - //Volley deikenleri - JsonArrayRequest jsonArrayRequest, jsonArrayRequestIcerik; - JsonObjectRequest jsonObjectRequest; - RequestQueue requestQueue; - ImageRequest imageRequest; - String urlAramaKullanici, urlIcerik; - TabLayout tabs; - - List icerikList = new ArrayList(); - List kisiList = new ArrayList(); - - int sayfaNumarasi = 1; - - YuklenmeEkran ekran; - ViewPager viewPager; - Toolbar toolbar; + private EditText searchEditText; + private ImageView searchImageView; + private JsonArrayRequest jsonArrayRequest; + private String urlAramaKullaniciString; + private List kisiArrayList = new ArrayList(); + private YuklenmeEkran yuklenmeEkran; public AramaFragment() { - // Required empty public constructor - Log.d("arama:", "Kullanc"); } public static AramaFragment newInstance() { @@ -81,28 +61,25 @@ public static AramaFragment newInstance() { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - viewPager = (ViewPager) getActivity().findViewById(R.id.pagerArama); - toolbar = (Toolbar) getActivity().findViewById(R.id.tool_bar_ara); - View rootView = inflater.inflate(R.layout.fragment_arama, container, false); - urlAramaKullanici = GYConfiguration.getDomain() + "usersearch/retrieve?keyword="; - urlIcerik = GYConfiguration.getDomain() + "contentsearch/retrieve?"; + Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbarAramaActivity); + searchEditText = (EditText) toolbar.findViewById(R.id.editTextSearchAramabar); + searchImageView = (ImageView) toolbar.findViewById(R.id.imageViewSearchBtnAramabar); - search = (EditText) toolbar.findViewById(R.id.etSearch); + fragmentAramaBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_arama, container, false); + View rootView = fragmentAramaBinding.getRoot(); - listView = (ListView) rootView.findViewById(R.id.lvliste); + urlAramaKullaniciString = GYConfiguration.getDomain() + "usersearch/retrieve?keyword="; - tvSonuc = (TextView) rootView.findViewById(R.id.tvSonuc); - btnAra = (ImageView) toolbar.findViewById(R.id.btnAra); + yuklenmeEkran = new YuklenmeEkran(getActivity()); - ekran = new YuklenmeEkran(getActivity()); - - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + fragmentAramaBinding.listViewlisteAramaFragment.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - if (kisiList.get(position) != null) { + if (kisiArrayList.get(position) != null) { Kisi kisi = new Kisi(); - kisi.setKullaniciAdi(kisiList.get(position).getKullaniciID()); + kisi.setKullaniciAdi(kisiArrayList.get(position).getKullaniciID()); Intent i = new Intent(getActivity(), ProfilActivity.class); i.putExtra(Kisi.PROFIL_ID, kisi.getKullaniciAdi()); startActivity(i); @@ -110,6 +87,17 @@ public void onItemClick(AdapterView parent, View view, int position, long id) } }); + searchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + performSearch(); + return true; + } + return false; + } + }); + return rootView; } @@ -118,28 +106,29 @@ public void onItemClick(AdapterView parent, View view, int position, long id) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.btnAra: - String link = (urlAramaKullanici + search.getText()).trim(); - link = link.replace(" ", "%20"); - kisiList.clear(); - Listele(link); + case R.id.imageViewSearchBtnAramabar: + performSearch(); break; } + } - + private void performSearch() { + String link = (urlAramaKullaniciString + searchEditText.getText()).trim(); + link = link.replace(" ", "%20"); + kisiArrayList.clear(); + Listele(link); } public void Listele(String url) { - ekran.surecBasla(); + yuklenmeEkran.surecBasla(); jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, url, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { - ekran.surecDurdur(); - + yuklenmeEkran.surecDurdur(); for (int i = 0; i < response.length(); i++) { @@ -152,7 +141,7 @@ public void onResponse(JSONArray response) { tempKisi.setKullaniciAvatarUrl(response.getJSONObject(i).getString("kullaniciAvatarUrl")); Log.d("TAG", "onResponse: " + tempKisi.getKullaniciAvatarUrl()); - kisiList.add(tempKisi); + kisiArrayList.add(tempKisi); } @@ -163,15 +152,13 @@ public void onResponse(JSONArray response) { } - KullaniciAramaAdapter adapter = new KullaniciAramaAdapter(getActivity(), kisiList); - listView.setAdapter(adapter); + KullaniciAramaAdapter adapter = new KullaniciAramaAdapter(getActivity(), kisiArrayList); + fragmentAramaBinding.listViewlisteAramaFragment.setAdapter(adapter); adapter.notifyDataSetChanged(); - - Log.d("parse islemi bitti:", "girildi"); - if (kisiList.isEmpty()) - tvSonuc.setVisibility(View.VISIBLE); - else tvSonuc.setVisibility(View.GONE); + if (kisiArrayList.isEmpty()) + fragmentAramaBinding.textViewSonucAramaFragment.setVisibility(View.VISIBLE); + else fragmentAramaBinding.textViewSonucAramaFragment.setVisibility(View.GONE); } }, new Response.ErrorListener() { @@ -186,7 +173,7 @@ public void onErrorResponse(VolleyError error) { AppController.getInstance().addToRequestQueue(jsonArrayRequest); InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(search.getWindowToken(), 0); + imm.hideSoftInputFromWindow(searchEditText.getWindowToken(), 0); } @@ -194,7 +181,7 @@ public void onErrorResponse(VolleyError error) { @Override public void onPageActivated() { - btnAra.setOnClickListener(this); + searchImageView.setOnClickListener(this); } } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/BlogEtkinlikListeFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/BlogEtkinlikListeFragment.java index 13a3fba..d31e9c5 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/BlogEtkinlikListeFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/BlogEtkinlikListeFragment.java @@ -1,6 +1,7 @@ package com.turkcell.gelecegiyazanlar.fragments; import android.animation.Animator; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; @@ -22,6 +23,7 @@ import com.turkcell.gelecegiyazanlar.adapterlisteners.RecyclerAdapterBlog; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.FragmentBlogListeBinding; import com.turkcell.gelecegiyazanlar.designs.SlidingTabLayout; import com.turkcell.gelecegiyazanlar.models.Blog; import com.turkcell.gelecegiyazanlar.utilities.TarihCevir; @@ -35,40 +37,40 @@ public class BlogEtkinlikListeFragment extends Fragment { - - JsonArrayRequest request; - - String url; - YuklenmeEkran yuklenmeEkran; - TarihCevir tarihCevir; - - List itemList = new ArrayList<>(); - RecyclerView recyclerView; - LinearLayout layout; - Toolbar toolbar; - RecyclerAdapterBlog recyclerAdapterBlog; - int a = 0; - private int index = -1; - private int maksSize; + private FragmentBlogListeBinding fragmentBlogListeBinding; + + private JsonArrayRequest jsonArrayRequest; + private String urlString; + private YuklenmeEkran yuklenmeEkran; + private TarihCevir tarihCevir; + private List blogArrayList = new ArrayList<>(); + private LinearLayout linearLayout; + private Toolbar toolbar; + private RecyclerAdapterBlog recyclerAdapterBlog; + private int indexAnInt = -1; + private int maksSizeAnInt; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + ViewPager viewPager = (ViewPager) getActivity().findViewById(R.id.viewPagerBlogFragment); + SlidingTabLayout tabLayout = (SlidingTabLayout) getActivity().findViewById(R.id.slidingTabLayoutTabsBlogFragment); + toolbar = (Toolbar) getActivity().findViewById(R.id.toolbarMainActivity); + linearLayout = (LinearLayout) getActivity().findViewById(R.id.linearLayoutUstBlokBlogFragment); - ViewPager viewPager = (ViewPager) getActivity().findViewById(R.id.pagerBlog); - SlidingTabLayout tabLayout = (SlidingTabLayout) getActivity().findViewById(R.id.tabsBlog); - - toolbar = (Toolbar) getActivity().findViewById(R.id.tool_bar); - layout = (LinearLayout) getActivity().findViewById(R.id.ust_blok); View rootView = inflater.inflate(R.layout.fragment_blog_liste, container, false); - recyclerView = (RecyclerView) rootView.findViewById(R.id.recyclerView); + + + fragmentBlogListeBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_blog_liste, container, false); + LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity().getBaseContext()); - recyclerView.setLayoutManager(linearLayoutManager); - recyclerView.setHasFixedSize(true); - recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); + fragmentBlogListeBinding.recyclerViewBlogListeFragment.setLayoutManager(linearLayoutManager); + fragmentBlogListeBinding.recyclerViewBlogListeFragment.setHasFixedSize(true); + fragmentBlogListeBinding.recyclerViewBlogListeFragment.setLayoutManager(new LinearLayoutManager(getActivity())); - url = GYConfiguration.getDomain() + "article/retrieve?nitems=10&index="; + urlString = GYConfiguration.getDomain() + "article/retrieve?nitems=10&index="; yuklenmeEkran = new YuklenmeEkran(getActivity()); tarihCevir = new TarihCevir(); @@ -86,7 +88,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse @Override public void onPageSelected(int position) { - itemList.clear(); + blogArrayList.clear(); switch (position) { case 0: Listele(718, -1); @@ -128,11 +130,11 @@ public void onPageScrollStateChanged(int state) { public void Listele(int kategori, int x) { - yuklenmeEkran.surecBasla(); + yuklenmeEkran.surecBasla(); - Log.d("urlBlog:", url + (1 + x) + "&kategoriID=" + kategori); - request = new JsonArrayRequest(Request.Method.GET, url + (1 + x) + "&kategoriID=" + kategori, null, new Response.Listener() { + Log.d("urlBlog:", urlString + (1 + x) + "&kategoriID=" + kategori); + jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, urlString + (1 + x) + "&kategoriID=" + kategori, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { @@ -161,7 +163,7 @@ public void onResponse(JSONArray response) { String tarih = tarihCevir.Cevir(date); - itemList.add(i, new Blog(title, tarih, author, excerpt, categories, authorUrl, image, profilID, blogID)); + blogArrayList.add(i, new Blog(title, tarih, author, excerpt, categories, authorUrl, image, profilID, blogID)); } catch (JSONException e) { @@ -169,9 +171,9 @@ public void onResponse(JSONArray response) { } } recyclerAdapterBlog = - new RecyclerAdapterBlog(itemList, getActivity()); - recyclerView.setAdapter(recyclerAdapterBlog); - maksSize = itemList.size(); + new RecyclerAdapterBlog(blogArrayList, getActivity()); + fragmentBlogListeBinding.recyclerViewBlogListeFragment.setAdapter(recyclerAdapterBlog); + maksSizeAnInt = blogArrayList.size(); recyclerAdapterBlog.notifyDataSetChanged(); } @@ -183,7 +185,7 @@ public void onErrorResponse(VolleyError error) { Log.d("Json:", "hata"); } }); - AppController.getInstance().addToRequestQueue(request); + AppController.getInstance().addToRequestQueue(jsonArrayRequest); } @@ -192,8 +194,8 @@ public void dahaFazla(int kategori, int x) { yuklenmeEkran.surecBasla(); - Log.d("urlDaha:", url + (1 + x) + "&kategoriID=" + kategori); - request = new JsonArrayRequest(Request.Method.GET, url + (1 + x) + "&kategoriID=" + kategori, null, new Response.Listener() { + Log.d("urlDaha:", urlString + (1 + x) + "&kategoriID=" + kategori); + jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, urlString + (1 + x) + "&kategoriID=" + kategori, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { @@ -222,7 +224,7 @@ public void onResponse(JSONArray response) { String tarih = tarihCevir.Cevir(date); - itemList.add(i + maksSize, new Blog(title, tarih, author, excerpt, categories, authorUrl, image, profilID, blogID)); + blogArrayList.add(i + maksSizeAnInt, new Blog(title, tarih, author, excerpt, categories, authorUrl, image, profilID, blogID)); } catch (JSONException e) { @@ -230,7 +232,7 @@ public void onResponse(JSONArray response) { } } - maksSize = maksSize + 10; + maksSizeAnInt = maksSizeAnInt + 10; recyclerAdapterBlog.notifyDataSetChanged(); @@ -243,28 +245,28 @@ public void onErrorResponse(VolleyError error) { Log.d("Json:", "hata"); } }); - AppController.getInstance().addToRequestQueue(request); + AppController.getInstance().addToRequestQueue(jsonArrayRequest); } public void Scroll(final int kategori) { - recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() { + fragmentBlogListeBinding.recyclerViewBlogListeFragment.setOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrolled(RecyclerView recyclerView, int dx, int dy) { /** * Srklenme bittiinde */ if (!recyclerView.canScrollVertically(1)) { - index++; - dahaFazla(kategori, index); + indexAnInt++; + dahaFazla(kategori, indexAnInt); /** * Aa Srklendiinde */ } else if (dy > 0) { - layout.animate() - .translationY(-layout.getBottom() - toolbar.getBottom()) + linearLayout.animate() + .translationY(-linearLayout.getBottom() - toolbar.getBottom()) .setInterpolator(new AccelerateInterpolator(2)) .setListener(new Animator.AnimatorListener() { @Override @@ -274,7 +276,7 @@ public void onAnimationStart(Animator animation) { @Override public void onAnimationEnd(Animator animation) { - layout.setVisibility(View.GONE); + linearLayout.setVisibility(View.GONE); } @Override @@ -289,13 +291,10 @@ public void onAnimationRepeat(Animator animation) { }) .start(); - } } }); } -} - - +} \ No newline at end of file diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/BlogFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/BlogFragment.java index 34beee9..49edc6a 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/BlogFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/BlogFragment.java @@ -1,33 +1,36 @@ package com.turkcell.gelecegiyazanlar.fragments; +import android.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.Toolbar; +import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.adapterlisteners.ViewPagerAdapterBlogEtkinlik; -import com.turkcell.gelecegiyazanlar.designs.SlidingTabLayout; +import com.turkcell.gelecegiyazanlar.databinding.FragmentBlogBinding; -public class BlogFragment extends android.support.v4.app.Fragment { - public SlidingTabLayout tabs; - Toolbar toolbar; - CharSequence titles[]; - int numbOfTabs = 5; +public class BlogFragment extends Fragment { + private FragmentBlogBinding fragmentBlogBinding; - ViewPager pager; - ViewPagerAdapterBlogEtkinlik adapter; + private CharSequence titlesCharSequences[]; + private int numbOfTabsAnInt = 5; + private ViewPagerAdapterBlogEtkinlik viewPagerAdapterBlogEtkinlik; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - toolbar = (Toolbar) getActivity().findViewById(R.id.tool_bar); View rootView = inflater.inflate(R.layout.fragment_blog, container, false); - titles = new CharSequence[]{ + + fragmentBlogBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_blog, container, false); + + + titlesCharSequences = new CharSequence[]{ getString(R.string.blog_kategori_gelecegi_yazanlar), getString(R.string.blog_kategori_mobil), getString(R.string.blog_kategori_android), @@ -35,19 +38,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, getString(R.string.blog_kategori_wp) }; - // Balklar,tab saysn adapterda tanmlar - adapter = new ViewPagerAdapterBlogEtkinlik(getFragmentManager(), titles, numbOfTabs); - - - pager = (ViewPager) rootView.findViewById(R.id.pagerBlog); - pager.setAdapter(adapter); - - - tabs = (SlidingTabLayout) rootView.findViewById(R.id.tabsBlog); - tabs.setDistributeEvenly(true); // tablarn dzenlenebilir olmasn salar - tabs.setSelectedIndicatorColors(getResources().getColor(R.color.beyaz_renk)); + viewPagerAdapterBlogEtkinlik = new ViewPagerAdapterBlogEtkinlik(getFragmentManager(), titlesCharSequences, numbOfTabsAnInt); - tabs.setViewPager(pager); + fragmentBlogBinding.viewPagerBlogFragment.setAdapter(viewPagerAdapterBlogEtkinlik); + fragmentBlogBinding.slidingTabLayoutTabsBlogFragment.setDistributeEvenly(true); + fragmentBlogBinding.slidingTabLayoutTabsBlogFragment.setSelectedIndicatorColors(ContextCompat.getColor(getActivity(), R.color.beyaz_renk)); + fragmentBlogBinding.slidingTabLayoutTabsBlogFragment.setViewPager(fragmentBlogBinding.viewPagerBlogFragment); return rootView; diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/EgitimFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/EgitimFragment.java index 56b2aa3..f1e3a72 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/EgitimFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/EgitimFragment.java @@ -1,17 +1,17 @@ package com.turkcell.gelecegiyazanlar.fragments; -import android.content.SharedPreferences; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.adapterlisteners.ViewPagerAdapter; -import com.turkcell.gelecegiyazanlar.designs.SlidingTabLayoutIcon; +import com.turkcell.gelecegiyazanlar.databinding.FragmentEgitimBinding; /** @@ -19,14 +19,10 @@ */ public class EgitimFragment extends Fragment { - public SlidingTabLayoutIcon tabs; - SharedPreferences preferences; - android.support.v7.widget.Toolbar toolbar; - ViewPager pager; - ViewPagerAdapter adapter; - CharSequence[] titles; - int numbOfTabs = 3; - ImageView ust_logo; + private FragmentEgitimBinding fragmentEgitimBinding; + + private CharSequence[] titlesCharSequences; + private int numbOfTabsAnInt = 3; public EgitimFragment() { } @@ -35,34 +31,30 @@ public EgitimFragment() { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_egitim, container, false); - titles = new CharSequence[]{ + fragmentEgitimBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_egitim, container, false); + + View rootView = fragmentEgitimBinding.getRoot(); + + titlesCharSequences = new CharSequence[]{ getString(R.string.egitim_kategori_mobil), getString(R.string.egitim_kategori_web), getString(R.string.egitim_kategori_oyun) }; - ust_logo = (ImageView) rootView.findViewById(R.id.logo_ust_ekran); - - //Baslangc resmi - ust_logo.setImageResource(R.drawable.mobil_ust_logo); - // Balklar,tab saysn adapterda tanmlar - adapter = new ViewPagerAdapter(getFragmentManager(), titles, numbOfTabs); - - - pager = (ViewPager) rootView.findViewById(R.id.pager); - pager.setAdapter(adapter); + ViewPagerAdapter viewPagerAdapter = new ViewPagerAdapter(getFragmentManager(), titlesCharSequences, numbOfTabsAnInt); + fragmentEgitimBinding.viewPagerEgitimFragment.setAdapter(viewPagerAdapter); // Tablarn grnm mens - tabs = (SlidingTabLayoutIcon) rootView.findViewById(R.id.tabs); - tabs.setDistributeEvenly(true); // tablarn dzenlenebilir olmasn salar - tabs.setSelectedIndicatorColors(getResources().getColor(R.color.selector)); + fragmentEgitimBinding.slidingTabLayoutIconEgitimFragment.setDistributeEvenly(true); // tablarn dzenlenebilir olmasn salar + + fragmentEgitimBinding.slidingTabLayoutIconEgitimFragment.setSelectedIndicatorColors(ContextCompat.getColor(getActivity(), R.color.selector)); // pager tablara baladk. - tabs.setViewPager(pager); + fragmentEgitimBinding.slidingTabLayoutIconEgitimFragment.setViewPager(fragmentEgitimBinding.viewPagerEgitimFragment); resimDegisikligiTabDinleyici(); @@ -73,7 +65,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, * Resim deiiklii salar.. */ public void resimDegisikligiTabDinleyici() { - tabs.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { + fragmentEgitimBinding.slidingTabLayoutIconEgitimFragment.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { @@ -83,13 +75,13 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse public void onPageSelected(int position) { switch (position) { case 0: - ust_logo.setImageResource(R.drawable.mobil_ust_logo); + fragmentEgitimBinding.imageViewLogoUstEkranEgitimFragment.setImageResource(R.drawable.mobil_ust_logo); break; case 1: - ust_logo.setImageResource(R.drawable.web_ust_logo); + fragmentEgitimBinding.imageViewLogoUstEkranEgitimFragment.setImageResource(R.drawable.web_ust_logo); break; case 2: - ust_logo.setImageResource(R.drawable.oyun_ust_logo); + fragmentEgitimBinding.imageViewLogoUstEkranEgitimFragment.setImageResource(R.drawable.oyun_ust_logo); break; } } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/ElcilerFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/ElcilerFragment.java index ad8f4b5..5e0b385 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/ElcilerFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/ElcilerFragment.java @@ -2,6 +2,7 @@ import android.content.Intent; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,34 +13,33 @@ import com.turkcell.gelecegiyazanlar.models.Kisi; -public class ElcilerFragment extends android.support.v4.app.Fragment { +public class ElcilerFragment extends Fragment { - LinearLayout lyDogukanYildirim; - LinearLayout lyGizemYurdagul; - LinearLayout lyAbdullahSarikaya; - LinearLayout lyKadirhanEkmekcioglu; - LinearLayout lyTanerUtku; - LinearLayout lyErenUtku; - LinearLayout lyVolkanKilic; - LinearLayout lyFeyzaOkumus; - String id; + private LinearLayout lyDogukanYildirim; + private LinearLayout lyGizemYurdagul; + private LinearLayout lyAbdullahSarikaya; + private LinearLayout lyKadirhanEkmekcioglu; + private LinearLayout lyTanerUtku; + private LinearLayout lyErenUtku; + private LinearLayout lyVolkanKilic; + private LinearLayout lyFeyzaOkumus; + private String id; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Inflate the layout for this fragment - View rootView = inflater.inflate(R.layout.fragment_gelistiriciler, container, false); + View rootView = inflater.inflate(R.layout.fragment_gelistiriciler, container, false); - lyFeyzaOkumus = (LinearLayout) rootView.findViewById(R.id.feyza); - lyDogukanYildirim = (LinearLayout) rootView.findViewById(R.id.dogukanYildirim); - lyGizemYurdagul = (LinearLayout) rootView.findViewById(R.id.gizemYurdagul); - lyAbdullahSarikaya = (LinearLayout) rootView.findViewById(R.id.abdullahSarikaya); - lyKadirhanEkmekcioglu = (LinearLayout) rootView.findViewById(R.id.kadirhanEkmekcioglu); - lyTanerUtku = (LinearLayout) rootView.findViewById(R.id.tanerUtku); - lyErenUtku = (LinearLayout) rootView.findViewById(R.id.erenUtku); - lyVolkanKilic = (LinearLayout) rootView.findViewById(R.id.volkanKilic); + lyFeyzaOkumus = (LinearLayout) rootView.findViewById(R.id.linearLayoutFeyza); + lyDogukanYildirim = (LinearLayout) rootView.findViewById(R.id.linearLayoutDogukanYildirim); + lyGizemYurdagul = (LinearLayout) rootView.findViewById(R.id.linearLayoutGizemYurdagul); + lyAbdullahSarikaya = (LinearLayout) rootView.findViewById(R.id.linearLayoutAbdullahSarikaya); + lyKadirhanEkmekcioglu = (LinearLayout) rootView.findViewById(R.id.linearLayoutKadirhanEkmekcioglu); + lyTanerUtku = (LinearLayout) rootView.findViewById(R.id.linearLayoutTanerUtku); + lyErenUtku = (LinearLayout) rootView.findViewById(R.id.linearLayoutErenUtku); + lyVolkanKilic = (LinearLayout) rootView.findViewById(R.id.linearLayoutVolkanKilic); lyFeyzaOkumus.setOnClickListener(new View.OnClickListener() { diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/EtkinlikFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/EtkinlikFragment.java index e74e824..a7a8866 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/EtkinlikFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/EtkinlikFragment.java @@ -1,7 +1,9 @@ package com.turkcell.gelecegiyazanlar.fragments; import android.animation.Animator; +import android.databinding.DataBindingUtil; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; @@ -20,6 +22,7 @@ import com.turkcell.gelecegiyazanlar.adapterlisteners.RecyclerAdapterEtkinlik; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.FragmentEtkinlikBinding; import com.turkcell.gelecegiyazanlar.models.Etkinlik; import com.turkcell.gelecegiyazanlar.utilities.TarihCevir; import com.turkcell.gelecegiyazanlar.utilities.YuklenmeEkran; @@ -33,74 +36,65 @@ import java.util.Date; import java.util.List; -public class EtkinlikFragment extends android.support.v4.app.Fragment { +public class EtkinlikFragment extends Fragment { + private FragmentEtkinlikBinding fragmentEtkinlikBinding; - Toolbar toolbar; - - - JsonArrayRequest request; - String url; - List itemList = new ArrayList<>(); - RecyclerView recyclerView; - RecyclerAdapterEtkinlik recyclerAdapterEtkinlik; - String formattedDate; - YuklenmeEkran yukleme; - TarihCevir tarihCevir; - LinearLayout layout; + private JsonArrayRequest jsonArrayRequest; + private String urlString; + private List etkinlikArrayList = new ArrayList<>(); + private RecyclerAdapterEtkinlik recyclerAdapterEtkinlik; + private String formattedDateString; + private YuklenmeEkran yuklemeEkran; + private TarihCevir tarihCevir; private LinearLayoutManager layoutManager; - private int index = 0; - private int maksSize; + private int indexAnInt = 0; + private int maksSizeAnInt; + private Toolbar toolbar; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Inflate the layout for this fragment - - final View rootView = inflater.inflate(R.layout.fragment_etkinlik, container, false); + fragmentEtkinlikBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_etkinlik, container, false); - toolbar = (Toolbar) getActivity().findViewById(R.id.tool_bar); + toolbar = (Toolbar) getActivity().findViewById(R.id.toolbarMainActivity); + View rootView = fragmentEtkinlikBinding.getRoot(); - yukleme = new YuklenmeEkran(getActivity()); + yuklemeEkran = new YuklenmeEkran(getActivity()); tarihCevir = new TarihCevir(); - layout = (LinearLayout) rootView.findViewById(R.id.layout_ust); layoutManager = new LinearLayoutManager(getActivity()); - url = GYConfiguration.getDomain() + "etkinlik/retrieve?nitems=10&index="; - recyclerView = (RecyclerView) rootView.findViewById(R.id.recyclerView); - recyclerView.setHasFixedSize(true); - recyclerView.setLayoutManager(layoutManager); + urlString = GYConfiguration.getDomain() + "etkinlik/retrieve?nitems=10&index="; + fragmentEtkinlikBinding.recyclerViewEtkinlikFragment.setHasFixedSize(true); + fragmentEtkinlikBinding.recyclerViewEtkinlikFragment.setLayoutManager(layoutManager); SimpleDateFormat currentDate = new SimpleDateFormat("dd/MM/yyyy"); Date todayDate = new Date(); - formattedDate = currentDate.format(todayDate); - - Log.d("time_current:", formattedDate); - + formattedDateString = currentDate.format(todayDate); Listele(0); - - recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() { + fragmentEtkinlikBinding.recyclerViewEtkinlikFragment.setOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrolled(RecyclerView recyclerView, int dx, int dy) { /** * Srklenme bittiinde */ if (!recyclerView.canScrollVertically(1)) { - index++; - dahaFazla(index); + indexAnInt++; + dahaFazla(indexAnInt); /** * Aa Srklendiinde */ } else if (dy > 0) { - layout.animate() - .translationY(-layout.getBottom() - toolbar.getBottom()) + fragmentEtkinlikBinding.linearLayoutUstEkranEtkinlikFragment.animate() + .translationY(-fragmentEtkinlikBinding.linearLayoutUstEkranEtkinlikFragment.getBottom() - toolbar.getBottom()) .setInterpolator(new AccelerateInterpolator(2)) .setListener(new Animator.AnimatorListener() { @Override @@ -110,7 +104,7 @@ public void onAnimationStart(Animator animation) { @Override public void onAnimationEnd(Animator animation) { - layout.setVisibility(View.GONE); + fragmentEtkinlikBinding.linearLayoutUstEkranEtkinlikFragment.setVisibility(View.GONE); } @Override @@ -143,14 +137,14 @@ public void Listele(int x) { if (GYConfiguration.checkInternetConnectionShowDialog(getActivity())) { - yukleme.surecBasla(); + yuklemeEkran.surecBasla(); } - request = new JsonArrayRequest(Request.Method.GET, url + x, null, new Response.Listener() { + jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, urlString + x, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { - yukleme.surecDurdur(); + yuklemeEkran.surecDurdur(); for (int i = 0; i < response.length(); i++) { @@ -166,12 +160,12 @@ public void onResponse(JSONArray response) { String gercekBitisTarih = tarihCevir.Cevir(endDate); - String kalanGun = Long.toString(Math.abs(farkAl(formattedDate, gercekBaslamaTarih))); + String kalanGun = Long.toString(Math.abs(farkAl(formattedDateString, gercekBaslamaTarih))); - if (farkAl(formattedDate, gercekBaslamaTarih) <= 0) { - itemList.add(i + maksSize, new Etkinlik(nodeID, title, gercekBaslamaTarih, gercekBitisTarih, thumbnail, kalanGun)); + if (farkAl(formattedDateString, gercekBaslamaTarih) <= 0) { + etkinlikArrayList.add(i + maksSizeAnInt, new Etkinlik(nodeID, title, gercekBaslamaTarih, gercekBitisTarih, thumbnail, kalanGun)); } else { - itemList.add(i + maksSize, new Etkinlik(nodeID, title, gercekBaslamaTarih, gercekBitisTarih, thumbnail, "-")); + etkinlikArrayList.add(i + maksSizeAnInt, new Etkinlik(nodeID, title, gercekBaslamaTarih, gercekBitisTarih, thumbnail, "-")); } } catch (JSONException e) { @@ -180,11 +174,11 @@ public void onResponse(JSONArray response) { e.printStackTrace(); } } - maksSize = itemList.size(); + maksSizeAnInt = etkinlikArrayList.size(); recyclerAdapterEtkinlik = - new RecyclerAdapterEtkinlik(itemList, getActivity()); + new RecyclerAdapterEtkinlik(etkinlikArrayList, getActivity()); - recyclerView.setAdapter(recyclerAdapterEtkinlik); + fragmentEtkinlikBinding.recyclerViewEtkinlikFragment.setAdapter(recyclerAdapterEtkinlik); } @@ -196,7 +190,7 @@ public void onErrorResponse(VolleyError error) { } }); - AppController.getInstance().addToRequestQueue(request); + AppController.getInstance().addToRequestQueue(jsonArrayRequest); } @@ -208,13 +202,13 @@ public void onErrorResponse(VolleyError error) { public void dahaFazla(int x) { - yukleme.surecBasla(); + yuklemeEkran.surecBasla(); - request = new JsonArrayRequest(Request.Method.GET, url + x, null, new Response.Listener() { + jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, urlString + x, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { - yukleme.surecDurdur(); + yuklemeEkran.surecDurdur(); for (int i = 0; i < response.length(); i++) { try { @@ -227,11 +221,11 @@ public void onResponse(JSONArray response) { String gercekBaslamaTarih = tarihCevir.Cevir(startDate); String gercekBitisTarih = tarihCevir.Cevir(endDate); - String kalanGun = Long.toString(Math.abs(farkAl(formattedDate, gercekBaslamaTarih))); - if (farkAl(formattedDate, gercekBaslamaTarih) <= 0) { - itemList.add(i + maksSize, new Etkinlik(nodeID, title, gercekBaslamaTarih, gercekBitisTarih, thumbnail, kalanGun)); + String kalanGun = Long.toString(Math.abs(farkAl(formattedDateString, gercekBaslamaTarih))); + if (farkAl(formattedDateString, gercekBaslamaTarih) <= 0) { + etkinlikArrayList.add(i + maksSizeAnInt, new Etkinlik(nodeID, title, gercekBaslamaTarih, gercekBitisTarih, thumbnail, kalanGun)); } else { - itemList.add(i + maksSize, new Etkinlik(nodeID, title, gercekBaslamaTarih, gercekBitisTarih, thumbnail, "-")); + etkinlikArrayList.add(i + maksSizeAnInt, new Etkinlik(nodeID, title, gercekBaslamaTarih, gercekBitisTarih, thumbnail, "-")); } } catch (JSONException e) { @@ -241,7 +235,7 @@ public void onResponse(JSONArray response) { } } - maksSize = maksSize + 10; + maksSizeAnInt = maksSizeAnInt + 10; recyclerAdapterEtkinlik.notifyDataSetChanged(); } @@ -254,7 +248,7 @@ public void onErrorResponse(VolleyError error) { } }); - AppController.getInstance().addToRequestQueue(request); + AppController.getInstance().addToRequestQueue(jsonArrayRequest); } @@ -264,17 +258,12 @@ public long farkAl(String d1, String d2) throws ParseException { SimpleDateFormat dates = new SimpleDateFormat("dd/MM/yyyy"); - date1 = dates.parse(d1); date2 = dates.parse(d2); - long difference = date1.getTime() - date2.getTime(); long differenceDates = difference / (24 * 60 * 60 * 1000); - - //String dayDifference = Long.toString(differenceDates); - return differenceDates; } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/IcerikAramaFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/IcerikAramaFragment.java index 05d2a16..805a56b 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/IcerikAramaFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/IcerikAramaFragment.java @@ -1,13 +1,16 @@ package com.turkcell.gelecegiyazanlar.fragments; import android.content.Context; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageView; @@ -23,6 +26,7 @@ import com.turkcell.gelecegiyazanlar.adapterlisteners.IcerikAramaAdapter; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.FragmentAramaBinding; import com.turkcell.gelecegiyazanlar.models.Icerik; import com.turkcell.gelecegiyazanlar.utilities.YuklenmeEkran; @@ -35,28 +39,19 @@ /** * Created by asus on 30.9.2015. */ -public class IcerikAramaFragment extends Fragment implements View.OnClickListener,AramaActivity.IArama { +public class IcerikAramaFragment extends Fragment implements View.OnClickListener, AramaActivity.IArama { - //List icerikList = new ArrayList(); - List icerikList = new ArrayList(); - EditText search; + private FragmentAramaBinding fragmentAramaBinding; - ImageView btnAra; - ListView listView; - TextView tvSonuc; - - //Volley deikenleri - JsonArrayRequest jsonArrayRequest; - String url; - int sayfaNumarasi=1; - - YuklenmeEkran ekran ; - - Toolbar toolbar; + private List icerikArrayList = new ArrayList(); + private EditText searchEditText; + private ImageView searchImageView; + private JsonArrayRequest jsonArrayRequest; + private String urlString; + private int sayfaNumarasiAnInt = 1; + private YuklenmeEkran yuklenmeEkran; public IcerikAramaFragment() { - - Log.d("arama:","Icerik"); } public static IcerikAramaFragment newInstance() { @@ -67,34 +62,31 @@ public static IcerikAramaFragment newInstance() { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbarAramaActivity); + searchEditText = (EditText) toolbar.findViewById(R.id.editTextSearchAramabar); + searchImageView = (ImageView) toolbar.findViewById(R.id.imageViewSearchBtnAramabar); - toolbar=(Toolbar)getActivity().findViewById(R.id.tool_bar_ara); - View rootView= inflater.inflate(R.layout.fragment_arama, container, false); - url = GYConfiguration.getDomain()+"contentsearch/retrieve?"; + fragmentAramaBinding = DataBindingUtil.inflate( - search=(EditText)toolbar.findViewById(R.id.etSearch); + inflater, R.layout.fragment_arama, container, false); + View rootView = fragmentAramaBinding.getRoot(); - listView = (ListView) rootView.findViewById(R.id.lvliste); - tvSonuc = (TextView) rootView.findViewById(R.id.tvSonuc); - btnAra = (ImageView) toolbar.findViewById(R.id.btnAra); + urlString = GYConfiguration.getDomain() + "contentsearch/retrieve?"; - ekran=new YuklenmeEkran(getActivity()); + yuklenmeEkran = new YuklenmeEkran(getActivity()); -// listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { -// @Override -// public void onItemClick(AdapterView parent, View view, int position, long id) { -// if (icerikList.get(position) != null) { -// Kisi kisi = new Kisi(); -// kisi.setKullaniciAdi(icerikList.get(position).getKullaniciID()); -// Intent i=new Intent(getActivity(), ProfilActivity.class); -// i.putExtra(Kisi.PROFIL_ID,kisi.getKullaniciAdi()); -// startActivity(i); -// } -// } -// }); - + searchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + performSearch(); + return true; + } + return false; + } + }); return rootView; } @@ -102,28 +94,32 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, @Override public void onClick(View v) { - switch (v.getId()){ - case R.id.btnAra: - String URL = (url +"keyword="+search.getText()+"&page="+sayfaNumarasi+"&nodeType=article").trim(); - URL = URL.replace(" ", "%20"); - Listele(URL); + switch (v.getId()) { + case R.id.imageViewSearchBtnAramabar: + performSearch(); break; } } + private void performSearch() { + String URL = (urlString + "keyword=" + searchEditText.getText() + "&page=" + sayfaNumarasiAnInt + "&nodeType=article").trim(); + URL = URL.replace(" ", "%20"); + Listele(URL); + } + public void Listele(String url) { - ekran.surecBasla(); - Log.d("icerikUrl:",url); + + yuklenmeEkran.surecBasla(); jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, url, null, new Response.Listener() { @Override public void onResponse(JSONArray response) { - ekran.surecDurdur(); + yuklenmeEkran.surecDurdur(); - icerikList.clear(); + icerikArrayList.clear(); for (int i = 0; i < response.length(); i++) { @@ -137,7 +133,7 @@ public void onResponse(JSONArray response) { tempIcerik.setExcerpt(response.getJSONObject(i).getString("excerpt")); Log.d("TAG", "onResponse: " + tempIcerik.getNodeID()); - icerikList.add(tempIcerik); + icerikArrayList.add(tempIcerik); } catch (JSONException e) { @@ -147,15 +143,14 @@ public void onResponse(JSONArray response) { } - IcerikAramaAdapter adapter = new IcerikAramaAdapter(getActivity(), icerikList); - listView.setAdapter(adapter); + IcerikAramaAdapter adapter = new IcerikAramaAdapter(getActivity(), icerikArrayList); + fragmentAramaBinding.listViewlisteAramaFragment.setAdapter(adapter); adapter.notifyDataSetChanged(); - Log.d("parse islemi bitti:", "girildi"); - if (icerikList.isEmpty()) - tvSonuc.setVisibility(View.VISIBLE); - else tvSonuc.setVisibility(View.GONE); + if (icerikArrayList.isEmpty()) + fragmentAramaBinding.textViewSonucAramaFragment.setVisibility(View.VISIBLE); + else fragmentAramaBinding.textViewSonucAramaFragment.setVisibility(View.GONE); } }, new Response.ErrorListener() { @@ -170,7 +165,7 @@ public void onErrorResponse(VolleyError error) { AppController.getInstance().addToRequestQueue(jsonArrayRequest); InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(search.getWindowToken(), 0); + imm.hideSoftInputFromWindow(searchEditText.getWindowToken(), 0); } @@ -178,8 +173,8 @@ public void onErrorResponse(VolleyError error) { @Override public void onPageActivated() { - btnAra.setOnClickListener(this); + searchImageView.setOnClickListener(this); } - } +} diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/MobilFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/MobilFragment.java index 06dd874..6dfb6b8 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/MobilFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/MobilFragment.java @@ -3,8 +3,10 @@ import android.animation.Animator; import android.content.Intent; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v4.content.res.ResourcesCompat; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; @@ -16,6 +18,7 @@ import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.activities.EgitimBaslikActivity; +import com.turkcell.gelecegiyazanlar.databinding.FragmentMobilBinding; import com.turkcell.gelecegiyazanlar.designs.SlidingTabLayoutIcon; import com.turkcell.gelecegiyazanlar.models.Egitim; @@ -27,233 +30,88 @@ public class MobilFragment extends Fragment implements View.OnClickListener { - LinearLayout ust_layout, android, androidIcerik, ios, iosIcerik, win, winIcerik, appinventor, appinventorIcerik, scratch, scratchIcerik, arduino, arduinoIcerik; + private FragmentMobilBinding fragmentMobilBinding; + private LinearLayout ustLinearLayout; + private SlidingTabLayoutIcon slidingTabLayoutIcon; + private Toolbar toolbar; - LinearLayout android101, android101Layout, android201, android201Layout, android301, android301Layout, android401, android401Layout; - LinearLayout ios101, ios101Layout, ios102, ios102Layout, ios201, ios201Layout, ios301, ios301Layout, ios401, ios401Layout; - LinearLayout win101, win101Layout, win201, win201Layout; - LinearLayout app101, app101Layout, app201, app201Layout, app301, app301Layout, app401, app401Layout; - LinearLayout scratch101, scratch101Layout, scratch201, scratch201Layout; - LinearLayout arduino101, arduino101Layout, arduino201, arduino201Layout, arduino301, arduino301Layout, arduino401, arduino401Layout; + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { - SlidingTabLayoutIcon tablar; - ImageView androidSagOk, android101AsagiOk, android201AsagiOk, android301AsagiOk, android401AsagiOk; - ImageView iosSagOk, ios101AsagiOk, ios102AsagiOk, ios201AsagiOk, ios301AsagiOk, ios401AsagiOk; - ImageView winSagOk, win101AsagiOk, win201AsagiOk; - ImageView appSagOk, app101AsagiOk, app201AsagiOk, app301AsagiOk, app401AsagiOk; - ImageView scratchSagOk, scratch101AsagiOk, scratch201AsagiOk; - ImageView arduinoSagOk, arduino101AsagiOk, arduino201AsagiOk, arduino301AsagiOk, arduino401AsagiOk; + toolbar = (Toolbar) getActivity().findViewById(R.id.toolbarMainActivity); - ImageView android101Button, android201Button, android301Button, android401Button, - ios101Button, ios102Button, ios201Button, ios301Button, ios401Button, - win101Button, win201Button, - scratch101Button, scratch201Button, - app101Button, app201Button, app301Button, app401Button, - arduino101Button, arduino201Button, arduino301Button, arduino401Button; - Toolbar toolbar; + fragmentMobilBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_mobil, container, false); + View rootView = fragmentMobilBinding.getRoot(); - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { + ustLinearLayout = (LinearLayout) getActivity().findViewById(R.id.linearLayoutUstEkranEgitimFragment); + slidingTabLayoutIcon = (SlidingTabLayoutIcon) getActivity().findViewById(R.id.slidingTabLayoutIconEgitimFragment); + + + fragmentMobilBinding.imageViewEgitimialAndroid101BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialAndroid201BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialAndroid301BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialAndroid401BtnMobilFragment.setOnClickListener(this); + + fragmentMobilBinding.imageViewEgitimialIos101BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialIos102BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialIos201BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialIos301BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialIos401BtnMobilFragment.setOnClickListener(this); - toolbar = (Toolbar) getActivity().findViewById(R.id.tool_bar); - View rootView = inflater.inflate(R.layout.fragment_mobil, container, false); + fragmentMobilBinding.imageViewEgitimialWindows101BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialWindows201BtnMobilFragment.setOnClickListener(this); - android = (LinearLayout) rootView.findViewById(R.id.android); - androidIcerik = (LinearLayout) rootView.findViewById(R.id.layout_android_icerik); - androidSagOk = (ImageView) rootView.findViewById(R.id.androidsagok); + fragmentMobilBinding.imageViewEgitimialScratch101BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialScratch201BtnMobilFragment.setOnClickListener(this); - android101AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_101_android); - android101 = (LinearLayout) rootView.findViewById(R.id.egitimal_android_101); - android101Layout = (LinearLayout) rootView.findViewById(R.id.layout_android_101); + fragmentMobilBinding.imageViewEgitimialAppinventor101BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialAppinventor201BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialAppinventor301BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialAppinventor401BtnMobilFragment.setOnClickListener(this); - android201AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_201_android); - android201 = (LinearLayout) rootView.findViewById(R.id.egitimal_android_201); - android201Layout = (LinearLayout) rootView.findViewById(R.id.layout_android_201); + fragmentMobilBinding.imageViewEgitimialArduino101BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialArduino201BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialArduino301BtnMobilFragment.setOnClickListener(this); + fragmentMobilBinding.imageViewEgitimialArduino401BtnMobilFragment.setOnClickListener(this); - android301AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_301_android); - android301 = (LinearLayout) rootView.findViewById(R.id.egitimal_android_301); - android301Layout = (LinearLayout) rootView.findViewById(R.id.layout_android_301); - android401AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_401_android); - android401 = (LinearLayout) rootView.findViewById(R.id.egitimal_android_401); - android401Layout = (LinearLayout) rootView.findViewById(R.id.layout_android_401); + fragmentMobilBinding.linearLayoutAndroidMobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutAndroid101MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutAndroid201MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutAndroid301MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutAndroid401MobilFragment.setOnClickListener(this); - ust_layout = (LinearLayout) getActivity().findViewById(R.id.ustekran); - tablar = (SlidingTabLayoutIcon) getActivity().findViewById(R.id.tabs); + fragmentMobilBinding.linearLayoutIosMobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutIos101MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutIos102MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutIos201MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutIos301MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutIos401MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutWindowsMobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutWindows101MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutWindows201MobilFragment.setOnClickListener(this); - ios = (LinearLayout) rootView.findViewById(R.id.ios); - iosIcerik = (LinearLayout) rootView.findViewById(R.id.layout_ios_icerik); - iosSagOk = (ImageView) rootView.findViewById(R.id.iossagok); + fragmentMobilBinding.linearLayoutAppinventorMobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutAppinventor101MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutAppinventor201MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutAppinventor301MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutAppinventor401MobilFragment.setOnClickListener(this); - ios101AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_101_ios); - ios101 = (LinearLayout) rootView.findViewById(R.id.egitimal_ios_101); - ios101Layout = (LinearLayout) rootView.findViewById(R.id.layout_ios_101); - - ios102AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_102_ios); - ios102 = (LinearLayout) rootView.findViewById(R.id.egitimal_ios_102); - ios102Layout = (LinearLayout) rootView.findViewById(R.id.layout_ios_102); - - ios201AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_201_ios); - ios201 = (LinearLayout) rootView.findViewById(R.id.egitimal_ios_201); - ios201Layout = (LinearLayout) rootView.findViewById(R.id.layout_ios_201); - - ios301AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_301_ios); - ios301 = (LinearLayout) rootView.findViewById(R.id.egitimal_ios_301); - ios301Layout = (LinearLayout) rootView.findViewById(R.id.layout_ios_301); - - ios401AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_401_ios); - ios401 = (LinearLayout) rootView.findViewById(R.id.egitimal_ios_401); - ios401Layout = (LinearLayout) rootView.findViewById(R.id.layout_ios_401); - - win = (LinearLayout) rootView.findViewById(R.id.win); - winIcerik = (LinearLayout) rootView.findViewById(R.id.layout_windows_icerik); - winSagOk = (ImageView) rootView.findViewById(R.id.windowssagok); - - win101AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_101_windows); - win101 = (LinearLayout) rootView.findViewById(R.id.egitimal_windows_101); - win101Layout = (LinearLayout) rootView.findViewById(R.id.layout_windows_101); - - win201AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_201_windows); - win201 = (LinearLayout) rootView.findViewById(R.id.egitimal_windows_201); - win201Layout = (LinearLayout) rootView.findViewById(R.id.layout_windows_201); - - appinventor = (LinearLayout) rootView.findViewById(R.id.appinventor); - appinventorIcerik = (LinearLayout) rootView.findViewById(R.id.layout_appinventor_icerik); - appSagOk = (ImageView) rootView.findViewById(R.id.appsagok); - - app101AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_101_appinventor); - app101 = (LinearLayout) rootView.findViewById(R.id.egitimal_appinventor_101); - app101Layout = (LinearLayout) rootView.findViewById(R.id.layout_appinventor_101); - - app201AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_201_appinventor); - app201 = (LinearLayout) rootView.findViewById(R.id.egitimal_appinventor_201); - app201Layout = (LinearLayout) rootView.findViewById(R.id.layout_appinventor_201); - - - app301AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_301_appinventor); - app301 = (LinearLayout) rootView.findViewById(R.id.egitimal_appinventor_301); - app301Layout = (LinearLayout) rootView.findViewById(R.id.layout_appinventor_301); - - app401AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_401_appinventor); - app401 = (LinearLayout) rootView.findViewById(R.id.egitimal_appinventor_401); - app401Layout = (LinearLayout) rootView.findViewById(R.id.layout_appinventor_401); - - scratch = (LinearLayout) rootView.findViewById(R.id.scratch); - scratchIcerik = (LinearLayout) rootView.findViewById(R.id.layout_scratch_icerik); - scratchSagOk = (ImageView) rootView.findViewById(R.id.scratchsagok); - - scratch101AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_101_scratch); - scratch101 = (LinearLayout) rootView.findViewById(R.id.egitimal_scratch_101); - scratch101Layout = (LinearLayout) rootView.findViewById(R.id.layout_scratch_101); - - scratch201AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_201_scratch); - scratch201 = (LinearLayout) rootView.findViewById(R.id.egitimal_scratch_201); - scratch201Layout = (LinearLayout) rootView.findViewById(R.id.layout_scratch_201); - - arduino = (LinearLayout) rootView.findViewById(R.id.arduino); - arduinoIcerik = (LinearLayout) rootView.findViewById(R.id.layout_arduino_icerik); - arduinoSagOk = (ImageView) rootView.findViewById(R.id.arduinosagok); - - arduino101AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_101_arduino); - arduino101 = (LinearLayout) rootView.findViewById(R.id.egitimal_arduino_101); - arduino101Layout = (LinearLayout) rootView.findViewById(R.id.layout_arduino_101); - - arduino201AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_201_arduino); - arduino201 = (LinearLayout) rootView.findViewById(R.id.egitimal_arduino_201); - arduino201Layout = (LinearLayout) rootView.findViewById(R.id.layout_arduino_201); - - arduino301AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_301_arduino); - arduino301 = (LinearLayout) rootView.findViewById(R.id.egitimal_arduino_301); - arduino301Layout = (LinearLayout) rootView.findViewById(R.id.layout_arduino_301); - - arduino401AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_401_arduino); - arduino401 = (LinearLayout) rootView.findViewById(R.id.egitimal_arduino_401); - arduino401Layout = (LinearLayout) rootView.findViewById(R.id.layout_arduino_401); - - - android101Button = (ImageView) rootView.findViewById(R.id.egitimial_android_101_button); - android201Button = (ImageView) rootView.findViewById(R.id.egitimial_android_201_button); - android301Button = (ImageView) rootView.findViewById(R.id.egitimial_android_301_button); - android401Button = (ImageView) rootView.findViewById(R.id.egitimial_android_401_button); - ios101Button = (ImageView) rootView.findViewById(R.id.egitimial_ios_101_button); - ios102Button = (ImageView) rootView.findViewById(R.id.egitimial_ios_102_button); - ios201Button = (ImageView) rootView.findViewById(R.id.egitimial_ios_201_button); - ios301Button = (ImageView) rootView.findViewById(R.id.egitimial_ios_301_button); - ios401Button = (ImageView) rootView.findViewById(R.id.egitimial_ios_401_button); - win101Button = (ImageView) rootView.findViewById(R.id.egitimial_windows_101_button); - win201Button = (ImageView) rootView.findViewById(R.id.egitimial_windows_201_button); - scratch101Button = (ImageView) rootView.findViewById(R.id.egitimial_scratch_101_button); - scratch201Button = (ImageView) rootView.findViewById(R.id.egitimial_scratch_201_button); - app101Button = (ImageView) rootView.findViewById(R.id.egitimial_appinventor_101_button); - app201Button = (ImageView) rootView.findViewById(R.id.egitimial_appinventor_201_button); - app301Button = (ImageView) rootView.findViewById(R.id.egitimial_appinventor_301_button); - app401Button = (ImageView) rootView.findViewById(R.id.egitimial_appinventor_401_button); - arduino101Button = (ImageView) rootView.findViewById(R.id.egitimial_arduino_101_button); - arduino201Button = (ImageView) rootView.findViewById(R.id.egitimial_arduino_201_button); - arduino301Button = (ImageView) rootView.findViewById(R.id.egitimial_arduino_301_button); - arduino401Button = (ImageView) rootView.findViewById(R.id.egitimial_arduino_401_button); - - - android101Button.setOnClickListener(this); - android201Button.setOnClickListener(this); - android301Button.setOnClickListener(this); - android401Button.setOnClickListener(this); - ios101Button.setOnClickListener(this); - ios102Button.setOnClickListener(this); - ios201Button.setOnClickListener(this); - ios301Button.setOnClickListener(this); - ios401Button.setOnClickListener(this); - win101Button.setOnClickListener(this); - win201Button.setOnClickListener(this); - scratch101Button.setOnClickListener(this); - scratch201Button.setOnClickListener(this); - app101Button.setOnClickListener(this); - app201Button.setOnClickListener(this); - app301Button.setOnClickListener(this); - app401Button.setOnClickListener(this); - arduino101Button.setOnClickListener(this); - arduino201Button.setOnClickListener(this); - arduino301Button.setOnClickListener(this); - arduino401Button.setOnClickListener(this); - - - android.setOnClickListener(this); - android101Layout.setOnClickListener(this); - android201Layout.setOnClickListener(this); - android301Layout.setOnClickListener(this); - android401Layout.setOnClickListener(this); - - ios.setOnClickListener(this); - ios101Layout.setOnClickListener(this); - ios102Layout.setOnClickListener(this); - ios201Layout.setOnClickListener(this); - ios301Layout.setOnClickListener(this); - ios401Layout.setOnClickListener(this); - - win.setOnClickListener(this); - win101Layout.setOnClickListener(this); - win201Layout.setOnClickListener(this); - - appinventor.setOnClickListener(this); - app101Layout.setOnClickListener(this); - app201Layout.setOnClickListener(this); - app301Layout.setOnClickListener(this); - app401Layout.setOnClickListener(this); - - scratch.setOnClickListener(this); - scratch101Layout.setOnClickListener(this); - scratch201Layout.setOnClickListener(this); - - arduino.setOnClickListener(this); - arduino101Layout.setOnClickListener(this); - arduino201Layout.setOnClickListener(this); - arduino301Layout.setOnClickListener(this); - arduino401Layout.setOnClickListener(this); + fragmentMobilBinding.linearLayoutScratchMobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutScratch101MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutScratch201MobilFragment.setOnClickListener(this); + + fragmentMobilBinding.linearLayoutArduinoMobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutArduino101MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutArduino201MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutArduino301MobilFragment.setOnClickListener(this); + fragmentMobilBinding.linearLayoutArduino401MobilFragment.setOnClickListener(this); return rootView; @@ -262,509 +120,428 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, @Override public void onClick(View v) { - Intent i = null; + switch (v.getId()) { + case R.id.imageViewEgitimialAndroid101BtnMobilFragment: + openEgitimBaslikActivity("Android 101", "android", getResources().getString(R.string.android101)); + break; + case R.id.imageViewEgitimialAndroid201BtnMobilFragment: + openEgitimBaslikActivity("Android 201", "android", getResources().getString(R.string.android201)); + break; + case R.id.imageViewEgitimialAndroid301BtnMobilFragment: + openEgitimBaslikActivity("Android 301", "android", getResources().getString(R.string.android301)); + break; + case R.id.imageViewEgitimialAndroid401BtnMobilFragment: + openEgitimBaslikActivity("Android 401", "android", getResources().getString(R.string.android401)); + break; + case R.id.imageViewEgitimialIos102BtnMobilFragment: + openEgitimBaslikActivity("IOS 102", "ios", getResources().getString(R.string.ios102)); + break; + case R.id.imageViewEgitimialIos101BtnMobilFragment: + openEgitimBaslikActivity("IOS 101", "ios", getResources().getString(R.string.ios101)); + break; + case R.id.imageViewEgitimialIos201BtnMobilFragment: + openEgitimBaslikActivity("IOS 201", "ios", getResources().getString(R.string.ios201)); + break; + case R.id.imageViewEgitimialIos301BtnMobilFragment: + openEgitimBaslikActivity("IOS 301", "ios", getResources().getString(R.string.ios301)); + break; + case R.id.imageViewEgitimialIos401BtnMobilFragment: + openEgitimBaslikActivity("IOS 401", "ios", getResources().getString(R.string.ios401)); + break; + case R.id.imageViewEgitimialWindows101BtnMobilFragment: + openEgitimBaslikActivity("Windows Phone 101", "win", getResources().getString(R.string.win101)); + break; + case R.id.imageViewEgitimialWindows201BtnMobilFragment: + openEgitimBaslikActivity("Windows Phone 201", "win", getResources().getString(R.string.win201)); + break; + case R.id.imageViewEgitimialAppinventor101BtnMobilFragment: + openEgitimBaslikActivity("App Inventor 101", "app", getResources().getString(R.string.inventor101)); + break; + case R.id.imageViewEgitimialAppinventor201BtnMobilFragment: + openEgitimBaslikActivity("App Inventor 201", "app", getResources().getString(R.string.inventor201)); + break; + case R.id.imageViewEgitimialAppinventor301BtnMobilFragment: + openEgitimBaslikActivity("App Inventor 301", "app", getResources().getString(R.string.inventor301)); + break; + case R.id.imageViewEgitimialAppinventor401BtnMobilFragment: + openEgitimBaslikActivity("App Inventor 401", "app", getResources().getString(R.string.inventor401)); + break; + case R.id.imageViewEgitimialArduino101BtnMobilFragment: + openEgitimBaslikActivity("Arduino 101", "arduino", getResources().getString(R.string.arduino101)); + break; + case R.id.imageViewEgitimialArduino201BtnMobilFragment: + openEgitimBaslikActivity("Arduino 201", "arduino", getResources().getString(R.string.arduino201)); + break; + case R.id.imageViewEgitimialArduino301BtnMobilFragment: + openEgitimBaslikActivity("Arduino 301", "arduino", getResources().getString(R.string.arduino301)); + break; + case R.id.imageViewEgitimialArduino401BtnMobilFragment: + openEgitimBaslikActivity("Arduino 401", "arduino", getResources().getString(R.string.arduino401)); + break; + case R.id.imageViewEgitimialScratch101BtnMobilFragment: + openEgitimBaslikActivity("Scratch 101", "scratch", getResources().getString(R.string.scratch101)); + break; + case R.id.imageViewEgitimialScratch201BtnMobilFragment: + openEgitimBaslikActivity("Scratch 201", "scratch", getResources().getString(R.string.scratch201)); + break; - case R.id.egitimial_android_101_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Android 101"); - i.putExtra(Egitim.COLOR_TAG, "android"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.android101)); - startActivity(i); - break; - case R.id.egitimial_android_201_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Android 201"); - i.putExtra(Egitim.COLOR_TAG, "android"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.android201)); - startActivity(i); - break; - case R.id.egitimial_android_301_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Android 301"); - i.putExtra(Egitim.COLOR_TAG, "android"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.android301)); - startActivity(i); - break; - case R.id.egitimial_android_401_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Android 401"); - i.putExtra(Egitim.COLOR_TAG, "android"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.android401)); - startActivity(i); - break; - case R.id.egitimial_ios_102_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "IOS 102"); - i.putExtra(Egitim.COLOR_TAG, "ios"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.ios102)); - startActivity(i); - break; - case R.id.egitimial_ios_101_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "IOS 101"); - i.putExtra(Egitim.COLOR_TAG, "ios"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.ios101)); - startActivity(i); - break; - case R.id.egitimial_ios_201_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "IOS 201"); - i.putExtra(Egitim.COLOR_TAG, "ios"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.ios201)); - startActivity(i); - break; - case R.id.egitimial_ios_301_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "IOS 301"); - i.putExtra(Egitim.COLOR_TAG, "ios"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.ios301)); - startActivity(i); - break; - case R.id.egitimial_ios_401_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "IOS 401"); - i.putExtra(Egitim.COLOR_TAG, "ios"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.ios401)); - startActivity(i); - break; - - case R.id.egitimial_windows_101_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Windows Phone 101"); - i.putExtra(Egitim.COLOR_TAG, "win"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.win101)); - startActivity(i); - break; - case R.id.egitimial_windows_201_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Windows Phone 201"); - i.putExtra(Egitim.COLOR_TAG, "win"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.win201)); - startActivity(i); - break; - - case R.id.egitimial_appinventor_101_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "App Inventor 101"); - i.putExtra(Egitim.COLOR_TAG, "app"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.inventor101)); - startActivity(i); - break; - case R.id.egitimial_appinventor_201_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "App Inventor 201"); - i.putExtra(Egitim.COLOR_TAG, "app"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.inventor201)); - startActivity(i); - break; - case R.id.egitimial_appinventor_301_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "App Inventor 301"); - i.putExtra(Egitim.COLOR_TAG, "app"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.inventor301)); - startActivity(i); - break; - - case R.id.egitimial_appinventor_401_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "App Inventor 401"); - i.putExtra(Egitim.COLOR_TAG, "app"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.inventor401)); - startActivity(i); - break; - - case R.id.egitimial_arduino_101_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Arduino 101"); - i.putExtra(Egitim.COLOR_TAG, "arduino"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.arduino101)); - startActivity(i); - break; - case R.id.egitimial_arduino_201_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Arduino 201"); - i.putExtra(Egitim.COLOR_TAG, "arduino"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.arduino201)); - startActivity(i); - break; - case R.id.egitimial_arduino_301_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Arduino 301"); - i.putExtra(Egitim.COLOR_TAG, "arduino"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.arduino301)); - startActivity(i); - break; - case R.id.egitimial_arduino_401_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Arduino 401"); - i.putExtra(Egitim.COLOR_TAG, "arduino"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.arduino401)); - startActivity(i); - break; - - - case R.id.egitimial_scratch_101_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Scratch 101"); - i.putExtra(Egitim.COLOR_TAG, "scratch"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.scratch101)); - startActivity(i); - break; - case R.id.egitimial_scratch_201_button: - i = new Intent(getActivity(), EgitimBaslikActivity.class); - i.putExtra(Egitim.TITLE_TAG, "Scratch 201"); - i.putExtra(Egitim.COLOR_TAG, "scratch"); - i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.scratch201)); - startActivity(i); - break; - - case R.id.android: - if (androidIcerik.getVisibility() == View.VISIBLE) { - androidIcerik.setVisibility(View.GONE); + case R.id.linearLayoutAndroidMobilFragment: + if (fragmentMobilBinding.linearLayoutAndroidIcerikMobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutAndroidIcerikMobilFragment.setVisibility(View.GONE); goster(); - tablar.setVisibility(View.VISIBLE); - androidSagOk.setImageDrawable(getResources().getDrawable(R.drawable.sagok)); + slidingTabLayoutIcon.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAndroidSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.sagok, null)); } else { - androidIcerik.setVisibility(View.VISIBLE); + fragmentMobilBinding.linearLayoutAndroidIcerikMobilFragment.setVisibility(View.VISIBLE); sakla(); - tablar.setVisibility(View.GONE); - androidSagOk.setImageDrawable(getResources().getDrawable(R.drawable.asagiok)); + slidingTabLayoutIcon.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAndroidSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.asagiok, null)); - iosIcerik.setVisibility(View.GONE); - winIcerik.setVisibility(View.GONE); - scratchIcerik.setVisibility(View.GONE); - appinventorIcerik.setVisibility(View.GONE); - arduinoIcerik.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutIosIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutWindowsIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutScratchIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAppinventorIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutArduinoIcerikMobilFragment.setVisibility(View.GONE); } break; - case R.id.layout_android_101: - if (android101.getVisibility() == View.VISIBLE) { - android101.setVisibility(View.GONE); - android101AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutAndroid101MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialAndroid101MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialAndroid101MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage101AndroidMobilFragment.setImageResource(R.drawable.asagiikon); } else { - android101.setVisibility(View.VISIBLE); - android101AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialAndroid101MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage101AndroidMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_android_201: - if (android201.getVisibility() == View.VISIBLE) { - android201.setVisibility(View.GONE); - android201AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutAndroid201MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialAndroid201MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialAndroid201MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage201AndroidMobilFragment.setImageResource(R.drawable.asagiikon); } else { - android201.setVisibility(View.VISIBLE); - android201AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialAndroid201MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage201AndroidMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_android_301: - if (android301.getVisibility() == View.VISIBLE) { - android301.setVisibility(View.GONE); - android301AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutAndroid301MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialAndroid301MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialAndroid301MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage301AndroidMobilFragment.setImageResource(R.drawable.asagiikon); } else { - android301.setVisibility(View.VISIBLE); - android301AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialAndroid301MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage301AndroidMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_android_401: - if (android401.getVisibility() == View.VISIBLE) { - android401.setVisibility(View.GONE); - android401AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutAndroid401MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialAndroid401MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialAndroid401MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage401AndroidMobilFragment.setImageResource(R.drawable.asagiikon); } else { - android401.setVisibility(View.VISIBLE); - android401AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialAndroid401MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage401AndroidMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.ios: - if (iosIcerik.getVisibility() == View.VISIBLE) { - iosIcerik.setVisibility(View.GONE); + case R.id.linearLayoutIosMobilFragment: + if (fragmentMobilBinding.linearLayoutIosIcerikMobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutIosIcerikMobilFragment.setVisibility(View.GONE); goster(); - tablar.setVisibility(View.VISIBLE); - iosSagOk.setImageDrawable(getResources().getDrawable(R.drawable.sagok)); + slidingTabLayoutIcon.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewIosSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.sagok, null)); } else { - iosIcerik.setVisibility(View.VISIBLE); + fragmentMobilBinding.linearLayoutIosIcerikMobilFragment.setVisibility(View.VISIBLE); sakla(); - tablar.setVisibility(View.GONE); - iosSagOk.setImageDrawable(getResources().getDrawable(R.drawable.asagiok)); + slidingTabLayoutIcon.setVisibility(View.GONE); + fragmentMobilBinding.imageViewIosSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.asagiok, null)); - androidIcerik.setVisibility(View.GONE); - winIcerik.setVisibility(View.GONE); - scratchIcerik.setVisibility(View.GONE); - appinventorIcerik.setVisibility(View.GONE); - arduinoIcerik.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAndroidIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutWindowsIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutScratchIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAppinventorIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutArduinoIcerikMobilFragment.setVisibility(View.GONE); } break; - case R.id.layout_ios_101: - if (ios101.getVisibility() == View.VISIBLE) { - ios101.setVisibility(View.GONE); - ios101AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutIos101MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialIos101MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialIos101MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage101IosMobilFragment.setImageResource(R.drawable.asagiikon); } else { - ios101.setVisibility(View.VISIBLE); - ios101AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialIos101MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage101IosMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_ios_102: - if (ios102.getVisibility() == View.VISIBLE) { - ios102.setVisibility(View.GONE); - ios102AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutIos102MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialIos102MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialIos102MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage102IosMobilFragment.setImageResource(R.drawable.asagiikon); } else { - ios102.setVisibility(View.VISIBLE); - ios102AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialIos102MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage102IosMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_ios_201: - if (ios201.getVisibility() == View.VISIBLE) { - ios201.setVisibility(View.GONE); - ios201AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutIos201MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialIos201MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialIos201MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage201IosMobilFragment.setImageResource(R.drawable.asagiikon); } else { - ios201.setVisibility(View.VISIBLE); - ios201AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialIos201MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage201IosMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_ios_301: - if (ios301.getVisibility() == View.VISIBLE) { - ios301.setVisibility(View.GONE); - ios301AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutIos301MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialIos301MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialIos301MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage301IosMobilFragment.setImageResource(R.drawable.asagiikon); } else { - ios301.setVisibility(View.VISIBLE); - ios301AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialIos301MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage301IosMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_ios_401: - if (ios401.getVisibility() == View.VISIBLE) { - ios401.setVisibility(View.GONE); - ios401AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutIos401MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialIos401MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialIos401MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage401IosMobilFragment.setImageResource(R.drawable.asagiikon); } else { - ios401.setVisibility(View.VISIBLE); - ios401AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialIos401MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage401IosMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.win: - if (winIcerik.getVisibility() == View.VISIBLE) { - winIcerik.setVisibility(View.GONE); + case R.id.linearLayoutWindowsMobilFragment: + if (fragmentMobilBinding.linearLayoutWindowsIcerikMobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutWindowsIcerikMobilFragment.setVisibility(View.GONE); goster(); - tablar.setVisibility(View.VISIBLE); - winSagOk.setImageDrawable(getResources().getDrawable(R.drawable.sagok)); + slidingTabLayoutIcon.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewWindowsSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.sagok, null)); } else { - winIcerik.setVisibility(View.VISIBLE); + fragmentMobilBinding.linearLayoutWindowsIcerikMobilFragment.setVisibility(View.VISIBLE); sakla(); - tablar.setVisibility(View.GONE); - winSagOk.setImageDrawable(getResources().getDrawable(R.drawable.asagiok)); - - iosIcerik.setVisibility(View.GONE); - androidIcerik.setVisibility(View.GONE); - scratchIcerik.setVisibility(View.GONE); - appinventorIcerik.setVisibility(View.GONE); - arduinoIcerik.setVisibility(View.GONE); + slidingTabLayoutIcon.setVisibility(View.GONE); + fragmentMobilBinding.imageViewWindowsSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.asagiok, null)); + + fragmentMobilBinding.linearLayoutIosIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAndroidIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutScratchIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAppinventorIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutArduinoIcerikMobilFragment.setVisibility(View.GONE); } break; - case R.id.layout_windows_101: - if (win101.getVisibility() == View.VISIBLE) { - win101.setVisibility(View.GONE); - win101AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutWindows101MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialWindows101MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialWindows101MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage101WindowsMobilFragment.setImageResource(R.drawable.asagiikon); } else { - win101.setVisibility(View.VISIBLE); - win101AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialWindows101MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage101WindowsMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_windows_201: - if (win201.getVisibility() == View.VISIBLE) { - win201.setVisibility(View.GONE); - win201AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutWindows201MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialWindows201MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialWindows201MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage201WindowsMobilFragment.setImageResource(R.drawable.asagiikon); } else { - win201.setVisibility(View.VISIBLE); - win201AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialWindows201MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage201WindowsMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.appinventor: - if (appinventorIcerik.getVisibility() == View.VISIBLE) { - appinventorIcerik.setVisibility(View.GONE); + case R.id.linearLayoutAppinventorMobilFragment: + if (fragmentMobilBinding.linearLayoutAppinventorIcerikMobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutAppinventorIcerikMobilFragment.setVisibility(View.GONE); goster(); - tablar.setVisibility(View.VISIBLE); - appSagOk.setImageDrawable(getResources().getDrawable(R.drawable.sagok)); + slidingTabLayoutIcon.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAppSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.sagok, null)); } else { - appinventorIcerik.setVisibility(View.VISIBLE); + fragmentMobilBinding.linearLayoutAppinventorIcerikMobilFragment.setVisibility(View.VISIBLE); sakla(); - tablar.setVisibility(View.GONE); - appSagOk.setImageDrawable(getResources().getDrawable(R.drawable.asagiok)); - - iosIcerik.setVisibility(View.GONE); - winIcerik.setVisibility(View.GONE); - scratchIcerik.setVisibility(View.GONE); - androidIcerik.setVisibility(View.GONE); - arduinoIcerik.setVisibility(View.GONE); + slidingTabLayoutIcon.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAppSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.asagiok, null)); + + fragmentMobilBinding.linearLayoutIosIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutWindowsIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutScratchIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAndroidIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutArduinoIcerikMobilFragment.setVisibility(View.GONE); } break; - case R.id.layout_appinventor_101: - if (app101.getVisibility() == View.VISIBLE) { - app101.setVisibility(View.GONE); - app101AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutAppinventor101MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialAppinventor101MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialAppinventor101MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage101AppinventorMobilFragment.setImageResource(R.drawable.asagiikon); } else { - app101.setVisibility(View.VISIBLE); - app101AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialAppinventor101MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage101AppinventorMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_appinventor_201: - if (app201.getVisibility() == View.VISIBLE) { - app201.setVisibility(View.GONE); - app201AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutAppinventor201MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialAppinventor201MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialAppinventor201MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage201AppinventorMobilFragment.setImageResource(R.drawable.asagiikon); } else { - app201.setVisibility(View.VISIBLE); - app201AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialAppinventor201MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage201AppinventorMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_appinventor_301: - if (app301.getVisibility() == View.VISIBLE) { - app301.setVisibility(View.GONE); - app301AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutAppinventor301MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialAppinventor301MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialAppinventor301MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage301AppinventorMobilFragment.setImageResource(R.drawable.asagiikon); } else { - app301.setVisibility(View.VISIBLE); - app301AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialAppinventor301MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage301AppinventorMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_appinventor_401: - if (app401.getVisibility() == View.VISIBLE) { - app401.setVisibility(View.GONE); - app401AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutAppinventor401MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialAppinventor401MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialAppinventor401MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage401AppinventorMobilFragment.setImageResource(R.drawable.asagiikon); } else { - app401.setVisibility(View.VISIBLE); - app401AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialAppinventor401MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage401AppinventorMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.scratch: - if (scratchIcerik.getVisibility() == View.VISIBLE) { - scratchIcerik.setVisibility(View.GONE); + case R.id.linearLayoutScratchMobilFragment: + if (fragmentMobilBinding.linearLayoutScratchIcerikMobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutScratchIcerikMobilFragment.setVisibility(View.GONE); goster(); - tablar.setVisibility(View.VISIBLE); - scratchSagOk.setImageDrawable(getResources().getDrawable(R.drawable.sagok)); + slidingTabLayoutIcon.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewScratchSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.sagok, null)); } else { - scratchIcerik.setVisibility(View.VISIBLE); + fragmentMobilBinding.linearLayoutScratchIcerikMobilFragment.setVisibility(View.VISIBLE); sakla(); - tablar.setVisibility(View.GONE); - scratchSagOk.setImageDrawable(getResources().getDrawable(R.drawable.asagiok)); + slidingTabLayoutIcon.setVisibility(View.GONE); + fragmentMobilBinding.imageViewScratchSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.asagiok, null)); - iosIcerik.setVisibility(View.GONE); - winIcerik.setVisibility(View.GONE); - androidIcerik.setVisibility(View.GONE); - appinventorIcerik.setVisibility(View.GONE); - arduinoIcerik.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutIosIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutWindowsIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAndroidIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAppinventorIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutArduinoIcerikMobilFragment.setVisibility(View.GONE); } break; - case R.id.layout_scratch_101: - if (scratch101.getVisibility() == View.VISIBLE) { - scratch101.setVisibility(View.GONE); - scratch101AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutScratch101MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialScratch101MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialScratch101MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage101ScratchMobilFragment.setImageResource(R.drawable.asagiikon); } else { - scratch101.setVisibility(View.VISIBLE); - scratch101AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialScratch101MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage101ScratchMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_scratch_201: - if (scratch201.getVisibility() == View.VISIBLE) { - scratch201.setVisibility(View.GONE); - scratch201AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutScratch201MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialScratch201MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialScratch201MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage201ScratchMobilFragment.setImageResource(R.drawable.asagiikon); } else { - scratch201.setVisibility(View.VISIBLE); - scratch201AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialScratch201MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage201ScratchMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.arduino: - if (arduinoIcerik.getVisibility() == View.VISIBLE) { - arduinoIcerik.setVisibility(View.GONE); + case R.id.linearLayoutArduinoMobilFragment: + if (fragmentMobilBinding.linearLayoutArduinoIcerikMobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutArduinoIcerikMobilFragment.setVisibility(View.GONE); goster(); - tablar.setVisibility(View.VISIBLE); - arduinoSagOk.setImageDrawable(getResources().getDrawable(R.drawable.sagok)); + slidingTabLayoutIcon.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewArduinoSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.sagok, null)); } else { - arduinoIcerik.setVisibility(View.VISIBLE); + fragmentMobilBinding.linearLayoutArduinoIcerikMobilFragment.setVisibility(View.VISIBLE); sakla(); - tablar.setVisibility(View.GONE); - arduinoSagOk.setImageDrawable(getResources().getDrawable(R.drawable.asagiok)); - - iosIcerik.setVisibility(View.GONE); - winIcerik.setVisibility(View.GONE); - scratchIcerik.setVisibility(View.GONE); - appinventorIcerik.setVisibility(View.GONE); - androidIcerik.setVisibility(View.GONE); + slidingTabLayoutIcon.setVisibility(View.GONE); + fragmentMobilBinding.imageViewArduinoSagOkMobilFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.asagiok, null)); + + fragmentMobilBinding.linearLayoutIosIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutWindowsIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutScratchIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAppinventorIcerikMobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.linearLayoutAndroidIcerikMobilFragment.setVisibility(View.GONE); } break; - case R.id.layout_arduino_101: - if (arduino101.getVisibility() == View.VISIBLE) { - arduino101.setVisibility(View.GONE); - arduino101AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutArduino101MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialArduino101MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialArduino101MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage101ArduinoMobilFragment.setImageResource(R.drawable.asagiikon); } else { - arduino101.setVisibility(View.VISIBLE); - arduino101AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialArduino101MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage101ArduinoMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_arduino_201: - if (arduino201.getVisibility() == View.VISIBLE) { - arduino201.setVisibility(View.GONE); - arduino201AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutArduino201MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialArduino201MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialArduino201MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage401ArduinoMobilFragment.setImageResource(R.drawable.asagiikon); } else { - arduino201.setVisibility(View.VISIBLE); - arduino201AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialArduino201MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage401ArduinoMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_arduino_301: - if (arduino301.getVisibility() == View.VISIBLE) { - arduino301.setVisibility(View.GONE); - arduino301AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutArduino301MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialArduino301MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialArduino301MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage301ArduinoMobilFragment.setImageResource(R.drawable.asagiikon); } else { - arduino301.setVisibility(View.VISIBLE); - arduino301AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialArduino301MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage301ArduinoMobilFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_arduino_401: - if (arduino401.getVisibility() == View.VISIBLE) { - arduino401.setVisibility(View.GONE); - arduino401AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutArduino401MobilFragment: + if (fragmentMobilBinding.linearLayoutEgitimialArduino401MobilFragment.getVisibility() == View.VISIBLE) { + fragmentMobilBinding.linearLayoutEgitimialArduino401MobilFragment.setVisibility(View.GONE); + fragmentMobilBinding.imageViewAsagiImage401ArduinoMobilFragment.setImageResource(R.drawable.asagiikon); } else { - arduino401.setVisibility(View.VISIBLE); - arduino401AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentMobilBinding.linearLayoutEgitimialArduino401MobilFragment.setVisibility(View.VISIBLE); + fragmentMobilBinding.imageViewAsagiImage401ArduinoMobilFragment.setImageResource(R.drawable.yukariikon); } break; } } + private void openEgitimBaslikActivity(String titleTag, String colorTag, String nodeId) { + + Intent i = new Intent(getActivity(), EgitimBaslikActivity.class); + i.putExtra(Egitim.TITLE_TAG, titleTag); + i.putExtra(Egitim.COLOR_TAG, colorTag); + i.putExtra(Egitim.NODE_ID, nodeId); + startActivity(i); + + } + public void sakla() { - ust_layout.animate().translationY(-ust_layout.getBottom() - toolbar.getBottom()).setInterpolator(new AccelerateInterpolator(2)) + ustLinearLayout.animate().translationY(-ustLinearLayout.getBottom() - toolbar.getBottom()).setInterpolator(new AccelerateInterpolator(2)) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { @@ -773,7 +550,7 @@ public void onAnimationStart(Animator animation) { @Override public void onAnimationEnd(Animator animation) { - ust_layout.setVisibility(View.GONE); + ustLinearLayout.setVisibility(View.GONE); } @Override @@ -789,11 +566,11 @@ public void onAnimationRepeat(Animator animation) { } public void goster() { - ust_layout.animate().translationY(0).setInterpolator(new DecelerateInterpolator(2)) + ustLinearLayout.animate().translationY(0).setInterpolator(new DecelerateInterpolator(2)) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { - ust_layout.setVisibility(View.VISIBLE); + ustLinearLayout.setVisibility(View.VISIBLE); } @Override diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/OyunFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/OyunFragment.java index ed4b8ff..d2b4247 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/OyunFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/OyunFragment.java @@ -2,8 +2,10 @@ import android.animation.Animator; import android.content.Intent; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v4.content.res.ResourcesCompat; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; @@ -15,6 +17,7 @@ import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.activities.EgitimBaslikActivity; +import com.turkcell.gelecegiyazanlar.databinding.FragmentOyunBinding; import com.turkcell.gelecegiyazanlar.designs.SlidingTabLayoutIcon; import com.turkcell.gelecegiyazanlar.models.Egitim; @@ -24,14 +27,10 @@ public class OyunFragment extends Fragment implements View.OnClickListener { + private FragmentOyunBinding fragmentOyunBinding; - LinearLayout ust_layout, oyun, oyunIcerik; - - - LinearLayout oyun101, oyun101Layout, oyun201, oyun201Layout; - - SlidingTabLayoutIcon tablar; - ImageView oyunSagOk, oyun101AsagiOk, oyun201AsagiOk, egitimiAl101, egitimiAl201; + private LinearLayout linearLayoutUstEkran; + private SlidingTabLayoutIcon slidingTabLayoutIcon; Toolbar toolbar; @@ -39,31 +38,23 @@ public class OyunFragment extends Fragment implements View.OnClickListener { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - toolbar = (Toolbar) getActivity().findViewById(R.id.tool_bar); - View rootView = inflater.inflate(R.layout.fragment_oyun, container, false); - - oyun = (LinearLayout) rootView.findViewById(R.id.oyun); - oyunIcerik = (LinearLayout) rootView.findViewById(R.id.layout_oyun_icerik); - oyunSagOk = (ImageView) rootView.findViewById(R.id.oyunsagok); + toolbar = (Toolbar) getActivity().findViewById(R.id.toolbarMainActivity); - oyun101AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_101_oyun); - oyun101 = (LinearLayout) rootView.findViewById(R.id.egitimal_oyun_101); - oyun101Layout = (LinearLayout) rootView.findViewById(R.id.layout_oyun_101); + fragmentOyunBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_oyun, container, false); - oyun201AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_201_oyun); - oyun201 = (LinearLayout) rootView.findViewById(R.id.egitimal_oyun_201); - oyun201Layout = (LinearLayout) rootView.findViewById(R.id.layout_oyun_201); + View rootView = fragmentOyunBinding.getRoot(); - ust_layout = (LinearLayout) getActivity().findViewById(R.id.ustekran); - tablar = (SlidingTabLayoutIcon) getActivity().findViewById(R.id.tabs); + linearLayoutUstEkran = (LinearLayout) getActivity().findViewById(R.id.linearLayoutUstEkranEgitimFragment); + slidingTabLayoutIcon = (SlidingTabLayoutIcon) getActivity().findViewById(R.id.slidingTabLayoutIconEgitimFragment); - oyun.setOnClickListener(this); - oyun101Layout.setOnClickListener(this); - oyun201Layout.setOnClickListener(this); - oyun101.setOnClickListener(this); - oyun201.setOnClickListener(this); + fragmentOyunBinding.linearLayoutOyunOyunFragment.setOnClickListener(this); + fragmentOyunBinding.linearLayoutOyun101OyunFragment.setOnClickListener(this); + fragmentOyunBinding.linearLayoutOyun201OyunFragment.setOnClickListener(this); + fragmentOyunBinding.linearLayoutEgitimalOyun101OyunFragment.setOnClickListener(this); + fragmentOyunBinding.linearLayoutEgitimalOyun201OyunFragment.setOnClickListener(this); return rootView; } @@ -74,41 +65,41 @@ public void onClick(View v) { Intent i = null; switch (v.getId()) { - case R.id.oyun: - if (oyunIcerik.getVisibility() == View.VISIBLE) { - oyunIcerik.setVisibility(View.GONE); + case R.id.linearLayoutOyunOyunFragment: + if (fragmentOyunBinding.linearLayoutOyunIcerikOyunFragment.getVisibility() == View.VISIBLE) { + fragmentOyunBinding.linearLayoutOyunIcerikOyunFragment.setVisibility(View.GONE); goster(); - tablar.setVisibility(View.VISIBLE); - oyunSagOk.setImageDrawable(getResources().getDrawable(R.drawable.sagok)); + slidingTabLayoutIcon.setVisibility(View.VISIBLE); + fragmentOyunBinding.imageViewOyunsagokOyunFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.sagok, null)); } else { - oyunIcerik.setVisibility(View.VISIBLE); + fragmentOyunBinding.linearLayoutOyunIcerikOyunFragment.setVisibility(View.VISIBLE); sakla(); - tablar.setVisibility(View.GONE); - oyunSagOk.setImageDrawable(getResources().getDrawable(R.drawable.asagiok)); + slidingTabLayoutIcon.setVisibility(View.GONE); + fragmentOyunBinding.imageViewOyunsagokOyunFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.asagiok, null)); } break; - case R.id.layout_oyun_101: - if (oyun101.getVisibility() == View.VISIBLE) { - oyun101.setVisibility(View.GONE); - oyun101AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutOyun101OyunFragment: + if (fragmentOyunBinding.linearLayoutEgitimalOyun101OyunFragment.getVisibility() == View.VISIBLE) { + fragmentOyunBinding.linearLayoutEgitimalOyun101OyunFragment.setVisibility(View.GONE); + fragmentOyunBinding.imageViewAsagiImage101OyunOyunFragment.setImageResource(R.drawable.asagiikon); } else { - oyun101.setVisibility(View.VISIBLE); - oyun101AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentOyunBinding.linearLayoutEgitimalOyun101OyunFragment.setVisibility(View.VISIBLE); + fragmentOyunBinding.imageViewAsagiImage101OyunOyunFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_oyun_201: - if (oyun201.getVisibility() == View.VISIBLE) { - oyun201.setVisibility(View.GONE); - oyun201AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutOyun201OyunFragment: + if (fragmentOyunBinding.linearLayoutEgitimalOyun201OyunFragment.getVisibility() == View.VISIBLE) { + fragmentOyunBinding.linearLayoutEgitimalOyun201OyunFragment.setVisibility(View.GONE); + fragmentOyunBinding.imageViewAsagiImage201OyunOyunFragment.setImageResource(R.drawable.asagiikon); } else { - oyun201.setVisibility(View.VISIBLE); - oyun201AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentOyunBinding.linearLayoutEgitimalOyun201OyunFragment.setVisibility(View.VISIBLE); + fragmentOyunBinding.imageViewAsagiImage201OyunOyunFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.egitimal_oyun_101: + case R.id.linearLayoutEgitimalOyun101OyunFragment: i = new Intent(getActivity(), EgitimBaslikActivity.class); i.putExtra(Egitim.TITLE_TAG, "Oyun Gelitirme 101"); i.putExtra(Egitim.COLOR_TAG, "oyun"); @@ -116,7 +107,7 @@ public void onClick(View v) { startActivity(i); break; - case R.id.egitimal_oyun_201: + case R.id.linearLayoutEgitimalOyun201OyunFragment: i = new Intent(getActivity(), EgitimBaslikActivity.class); i.putExtra(Egitim.TITLE_TAG, "Oyun Gelitirme 201"); i.putExtra(Egitim.COLOR_TAG, "oyun"); @@ -130,7 +121,7 @@ public void onClick(View v) { } public void sakla() { - ust_layout.animate().translationY(-ust_layout.getBottom() - toolbar.getBottom()).setInterpolator(new AccelerateInterpolator(2)) + linearLayoutUstEkran.animate().translationY(-linearLayoutUstEkran.getBottom() - toolbar.getBottom()).setInterpolator(new AccelerateInterpolator(2)) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { @@ -139,7 +130,7 @@ public void onAnimationStart(Animator animation) { @Override public void onAnimationEnd(Animator animation) { - ust_layout.setVisibility(View.GONE); + linearLayoutUstEkran.setVisibility(View.GONE); } @Override @@ -155,11 +146,11 @@ public void onAnimationRepeat(Animator animation) { } public void goster() { - ust_layout.animate().translationY(0).setInterpolator(new DecelerateInterpolator(2)) + linearLayoutUstEkran.animate().translationY(0).setInterpolator(new DecelerateInterpolator(2)) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { - ust_layout.setVisibility(View.VISIBLE); + linearLayoutUstEkran.setVisibility(View.VISIBLE); } @Override diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/ProfilFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/ProfilFragment.java index 4a32c7f..f09ccdb 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/ProfilFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/ProfilFragment.java @@ -2,6 +2,7 @@ import android.content.Intent; import android.content.pm.PackageManager; +import android.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; @@ -28,6 +29,7 @@ import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.configurations.AppController; import com.turkcell.gelecegiyazanlar.configurations.GYConfiguration; +import com.turkcell.gelecegiyazanlar.databinding.FragmentProfilBinding; import com.turkcell.gelecegiyazanlar.designs.SlidingTabLayout; import com.turkcell.gelecegiyazanlar.models.Kisi; import com.turkcell.gelecegiyazanlar.utilities.YuklenmeEkran; @@ -38,113 +40,60 @@ public class ProfilFragment extends Fragment implements View.OnClickListener { + private FragmentProfilBinding fragmentProfilBinding; - JsonObjectRequest jsonObjectRequest; - String kategori; - String hakkindaTemiz; + private JsonObjectRequest jsonObjectRequest; + private ImageRequest imageRequest; - ImageRequest requestImage; - String avatarUrl; + private String kategoriString; + private String hakkindaTemizString; + private String avatarUrlString; + private String idString; + private String urlString; + private String facebookUrlString; + private String twitterUrlString; + private String googleplusUrlString; + private String linkedinUrlString; + private String githubUrlString; + private String blogUrlString; - String id; + private YuklenmeEkran yuklenmeEkran; - LinearLayout basariBelgeleriLayout,hakkindaLayout,basariBelgeleriCizgi,hakkindaCizgi; - - TextView isim,yasadigiSegir,universite,hakkinda; - - ImageView avatar,android101,android201,android301,android401,ios101,ios201,ios301,ios401 - ,wp101,wp201,mobiloyun101,mobiloyun201,web101,web201,web301,web401,scratch101,scratch201,ai101,ai201,ai301,arduino101 - ,arduino201,arduino301,arduino401; - - String url; - - FloatingActionButton facebook,google,twitter,linkedin; - - String facebookUrl; - String twitterUrl; - String googleplusUrl; - String linkedinUrl; - String githubUrl; - String blogUrl; - - YuklenmeEkran yuklenmeEkran; + private TextView isimTextView, yasadigiSegirTextView, universiteTextView, hakkindaTextView; + private ImageView avatarImageView; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + fragmentProfilBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_profil, container, false); + View rootView = fragmentProfilBinding.getRoot(); - View rootView= inflater.inflate(R.layout.fragment_profil, container, false); - - url = GYConfiguration.getDomain() + "profil/retrieve?userID="; - - yuklenmeEkran=new YuklenmeEkran(getActivity()); - - basariBelgeleriLayout = (LinearLayout) rootView.findViewById(R.id.basariBelgeleriLayout); - hakkindaLayout = (LinearLayout) rootView.findViewById(R.id.hakkindaLayout); - basariBelgeleriCizgi = (LinearLayout) rootView.findViewById(R.id.basaribelgeleriCizgi); - hakkindaCizgi = (LinearLayout) rootView.findViewById(R.id.hakkindaCizgi); - - isim = (TextView) getActivity().findViewById(R.id.adSoyad); - yasadigiSegir = (TextView) getActivity().findViewById(R.id.konum); - universite = (TextView) getActivity().findViewById(R.id.universite); - hakkinda = (TextView) rootView.findViewById(R.id.hakkinda); - avatar = (ImageView) getActivity().findViewById(R.id.avatar); - - android101 = (ImageView) rootView.findViewById(R.id.android101); - android201 = (ImageView) rootView.findViewById(R.id.android201); - android301 = (ImageView) rootView.findViewById(R.id.android301); - android401 = (ImageView) rootView.findViewById(R.id.android401); + urlString = GYConfiguration.getDomain() + "profil/retrieve?userID="; + yuklenmeEkran = new YuklenmeEkran(getActivity()); - ios101 = (ImageView) rootView.findViewById(R.id.ios101); - ios201 = (ImageView) rootView.findViewById(R.id.ios201); - ios301 = (ImageView) rootView.findViewById(R.id.ios301); - ios401 = (ImageView) rootView.findViewById(R.id.ios401); + isimTextView = (TextView) getActivity().findViewById(R.id.textViewAdSoyadProfilActivity); + yasadigiSegirTextView = (TextView) getActivity().findViewById(R.id.textViewKonumProfilActivity); + universiteTextView = (TextView) getActivity().findViewById(R.id.textViewUniversiteProfilActivity); + hakkindaTextView = (TextView) rootView.findViewById(R.id.textViewHakkindaProfilFragment); + avatarImageView = (ImageView) getActivity().findViewById(R.id.circleImageViewAvatarProfilActivity); - wp101 = (ImageView) rootView.findViewById(R.id.wp101); - wp201 = (ImageView) rootView.findViewById(R.id.wp201); + SlidingTabLayout tabs = (SlidingTabLayout) getActivity().findViewById(R.id.slidingTabLayoutTabsBlogFragment); - mobiloyun101 = (ImageView) rootView.findViewById(R.id.mobiloyun101); - mobiloyun201 = (ImageView) rootView.findViewById(R.id.mobiloyun201); + final FrameLayout frameLayout = (FrameLayout) rootView.findViewById(R.id.frameLay); + final FloatingActionsMenu fabMenu = (FloatingActionsMenu) rootView.findViewById(R.id.floatActionButtonMenuProfilFragment); - web101 = (ImageView) rootView.findViewById(R.id.web101); - web201 = (ImageView) rootView.findViewById(R.id.web201); - web301 = (ImageView) rootView.findViewById(R.id.web301); - web401 = (ImageView) rootView.findViewById(R.id.web401); - - scratch101 = (ImageView) rootView.findViewById(R.id.scratch101); - scratch201 = (ImageView) rootView.findViewById(R.id.scratch201); - - ai101 = (ImageView) rootView.findViewById(R.id.ai101); - ai201 = (ImageView) rootView.findViewById(R.id.ai201); - ai301 = (ImageView) rootView.findViewById(R.id.ai301); - - arduino101 = (ImageView) rootView.findViewById(R.id.arduino101); - arduino201 = (ImageView) rootView.findViewById(R.id.arduino201); - arduino301 = (ImageView) rootView.findViewById(R.id.arduino301); - arduino401 = (ImageView) rootView.findViewById(R.id.arduino401); - - SlidingTabLayout tabs= (SlidingTabLayout) getActivity().findViewById(R.id.tabsBlog); - - final FrameLayout frameLayout=(FrameLayout)rootView.findViewById(R.id.frameLay); - final FloatingActionsMenu fabMenu = (FloatingActionsMenu) rootView.findViewById(R.id.fab_menu); - - facebook=(FloatingActionButton)rootView.findViewById(R.id.fab_face); - twitter=(FloatingActionButton)rootView.findViewById(R.id.fab_twitter); - linkedin=(FloatingActionButton)rootView.findViewById(R.id.fab_linkedin); - google=(FloatingActionButton)rootView.findViewById(R.id.fab_google); - - facebook.setOnClickListener(this); - twitter.setOnClickListener(this); - linkedin.setOnClickListener(this); - google.setOnClickListener(this); + fragmentProfilBinding.floatActionButtonFacebookProfilFragment.setOnClickListener(this); + fragmentProfilBinding.floatActionButtonTwitterProfilFragment.setOnClickListener(this); + fragmentProfilBinding.floatActionButtonLinkedinProfilFragment.setOnClickListener(this); + fragmentProfilBinding.floatActionButtonGoogleProfilFragment.setOnClickListener(this); fabMenu.setOnFloatingActionsMenuUpdateListener(new FloatingActionsMenu.OnFloatingActionsMenuUpdateListener() { @Override public void onMenuExpanded() { - // frameLayout.getBackground().setAlpha(240); frameLayout.setEnabled(false); frameLayout.setOnTouchListener(new View.OnTouchListener() { @Override @@ -158,193 +107,179 @@ public boolean onTouch(View v, MotionEvent event) { @Override public void onMenuCollapsed() { - // frameLayout.getBackground().setAlpha(0); frameLayout.setOnTouchListener(null); } }); - Bundle extra=getActivity().getIntent().getExtras(); - id = extra.getString(Kisi.PROFIL_ID); + Bundle extra = getActivity().getIntent().getExtras(); + idString = extra.getString(Kisi.PROFIL_ID); -tabs.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + tabs.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - } + } - @Override - public void onPageSelected(int position) { - - if(position == 1){ - basariBelgeleriLayout.setVisibility(View.VISIBLE); - basariBelgeleriCizgi.setVisibility(View.VISIBLE); - hakkindaLayout.setVisibility(View.INVISIBLE); - hakkindaCizgi.setVisibility(View.INVISIBLE); - fabMenu.setVisibility(View.GONE); - } else { - basariBelgeleriLayout.setVisibility(View.INVISIBLE); - basariBelgeleriCizgi.setVisibility(View.INVISIBLE); - hakkindaLayout.setVisibility(View.VISIBLE); - hakkindaCizgi.setVisibility(View.VISIBLE); - } - } + @Override + public void onPageSelected(int position) { + + if (position == 1) { + fragmentProfilBinding.linearLayoutBasariBelgeleriProfilFragment.setVisibility(View.VISIBLE); + fragmentProfilBinding.linearLayoutBasariBelgeleriCizgiProfilFragment.setVisibility(View.VISIBLE); + fragmentProfilBinding.linearLayoutHakkindaProfilFragment.setVisibility(View.INVISIBLE); + fragmentProfilBinding.linearLayoutHakkindaCizgiProfilFragment.setVisibility(View.INVISIBLE); + fabMenu.setVisibility(View.GONE); + } else { + fragmentProfilBinding.linearLayoutBasariBelgeleriProfilFragment.setVisibility(View.INVISIBLE); + fragmentProfilBinding.linearLayoutBasariBelgeleriCizgiProfilFragment.setVisibility(View.INVISIBLE); + fragmentProfilBinding.linearLayoutHakkindaProfilFragment.setVisibility(View.VISIBLE); + fragmentProfilBinding.linearLayoutHakkindaCizgiProfilFragment.setVisibility(View.VISIBLE); + } + } - @Override - public void onPageScrollStateChanged(int state) { + @Override + public void onPageScrollStateChanged(int state) { - } -}); + } + }); - EkleYazi(id); + EkleYazi(idString); - // Inflate the layout for this fragm return rootView; } - public void EkleYazi(String id){ + public void EkleYazi(String id) { yuklenmeEkran.surecBasla(); - Log.d("profil:", url + id); - jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, url + id, null, new Response.Listener() { + + jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, urlString + id, null, new Response.Listener() { @Override public void onResponse(JSONObject response) { yuklenmeEkran.surecDurdur(); try { - isim.setText(response.getString("adSoyad")); - yasadigiSegir.setText(response.getString("yasadigiSehir")); - universite.setText(response.getString("universite")); - avatarUrl = response.getString("avatarUrl"); - - facebookUrl = response.getJSONObject("sosyalAglar").getString("facebook"); - twitterUrl = response.getJSONObject("sosyalAglar").getString("twitter"); - googleplusUrl = response.getJSONObject("sosyalAglar").getString("googleplus"); - linkedinUrl = response.getJSONObject("sosyalAglar").getString("linkedin"); - githubUrl = response.getJSONObject("sosyalAglar").getString("github"); - blogUrl = response.getJSONObject("sosyalAglar").getString("blog"); - - hakkindaTemiz = response.getString("hakkinda").replace("'", "'"); - hakkindaTemiz = hakkindaTemiz.replace("&", "&"); - hakkindaTemiz = hakkindaTemiz.replace(";amp;", " "); - hakkindaTemiz = hakkindaTemiz.replace(""", "\""); - if(hakkindaTemiz != "null") { - hakkinda.setText(hakkindaTemiz); - }else - hakkinda.setText(""); - - for(int i=0; i < response.getJSONObject("basariBelgeleri").length(); i++){ - Log.i("sayisi: ", Integer.toString(response.getJSONObject("basariBelgeleri").length())); - Log.i("kategori: " ,response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("kategori") ); - Log.i("seviye: ", response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi")); - - - - - kategori = response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("kategori"); - - if( kategori.equals("Android")){ - Log.i("ife", "girdi"); - if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("101")){ - Log.i("içteki ife", "girdi"); - android101.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("201")){ - android201.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("301")){ - android301.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("401")){ - android401.setVisibility(View.VISIBLE); + isimTextView.setText(response.getString("adSoyad")); + yasadigiSegirTextView.setText(response.getString("yasadigiSehir")); + universiteTextView.setText(response.getString("universite")); + avatarUrlString = response.getString("avatarUrl"); + + facebookUrlString = response.getJSONObject("sosyalAglar").getString("facebook"); + twitterUrlString = response.getJSONObject("sosyalAglar").getString("twitter"); + googleplusUrlString = response.getJSONObject("sosyalAglar").getString("googleplus"); + linkedinUrlString = response.getJSONObject("sosyalAglar").getString("linkedin"); + githubUrlString = response.getJSONObject("sosyalAglar").getString("github"); + blogUrlString = response.getJSONObject("sosyalAglar").getString("blog"); + + hakkindaTemizString = response.getString("hakkinda").replace("'", "'"); + hakkindaTemizString = hakkindaTemizString.replace("&", "&"); + hakkindaTemizString = hakkindaTemizString.replace(";amp;", " "); + hakkindaTemizString = hakkindaTemizString.replace(""", "\""); + if (hakkindaTemizString != "null") { + hakkindaTextView.setText(hakkindaTemizString); + } else + hakkindaTextView.setText(""); + + for (int i = 0; i < response.getJSONObject("basariBelgeleri").length(); i++) { + + kategoriString = response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("kategori"); + + if (kategoriString.equals("Android")) { + + if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("101")) { + + fragmentProfilBinding.imageViewAndroid101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("201")) { + fragmentProfilBinding.imageViewAndroid201ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("301")) { + fragmentProfilBinding.imageViewAndroid301ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("401")) { + fragmentProfilBinding.imageViewAndroid401ProfilFragment.setVisibility(View.VISIBLE); } - } else if( kategori.equals("iOS")){ + } else if (kategoriString.equals("iOS")) { - if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("101")){ - ios101.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("201")){ - ios201.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("301")){ - ios301.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("401")){ - ios401.setVisibility(View.VISIBLE); + if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("101")) { + fragmentProfilBinding.imageViewIos101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("201")) { + fragmentProfilBinding.imageViewIos201ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("301")) { + fragmentProfilBinding.imageViewIos301ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("401")) { + fragmentProfilBinding.imageViewIos401ProfilFragment.setVisibility(View.VISIBLE); } - } else if( kategori.equals("Windows Phone")){ + } else if (kategoriString.equals("Windows Phone")) { - if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("101")){ - wp101.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("201")){ - wp201.setVisibility(View.VISIBLE); + if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("101")) { + fragmentProfilBinding.imageViewWp101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("201")) { + fragmentProfilBinding.imageViewWp201ProfilFragment.setVisibility(View.VISIBLE); } - } else if( kategori.equals("Mobil Oyun")){ + } else if (kategoriString.equals("Mobil Oyun")) { - if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("101")){ - mobiloyun101.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("201")){ - mobiloyun201.setVisibility(View.VISIBLE); + if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("101")) { + fragmentProfilBinding.imageViewMobilOyun101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("201")) { + fragmentProfilBinding.imageViewMobilOyun201ProfilFragment.setVisibility(View.VISIBLE); } - } else if( kategori.equals("Web Programlama")){ + } else if (kategoriString.equals("Web Programlama")) { - if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("101")){ - web101.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("201")){ - web201.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("301")){ - web301.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("401")){ - web401.setVisibility(View.VISIBLE); + if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("101")) { + fragmentProfilBinding.imageViewWeb101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("201")) { + fragmentProfilBinding.imageViewWeb201ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("301")) { + fragmentProfilBinding.imageViewWeb301ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("401")) { + fragmentProfilBinding.imageViewWeb401ProfilFragment.setVisibility(View.VISIBLE); } - } else if( kategori.equals("Scratch")){ + } else if (kategoriString.equals("Scratch")) { - if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("101")){ - scratch101.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("201")){ - scratch201.setVisibility(View.VISIBLE); + if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("101")) { + fragmentProfilBinding.imageViewScratch101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("201")) { + fragmentProfilBinding.imageViewScratch201ProfilFragment.setVisibility(View.VISIBLE); } - } else if( kategori.equals("App Inventor")){ + } else if (kategoriString.equals("App Inventor")) { - if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("101")){ - ai101.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("201")){ - ai201.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("301")){ - ai301.setVisibility(View.VISIBLE); + if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("101")) { + fragmentProfilBinding.imageViewAi101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("201")) { + fragmentProfilBinding.imageViewAi201ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("301")) { + fragmentProfilBinding.imageViewAi301ProfilFragment.setVisibility(View.VISIBLE); } - } else if( kategori.equals("Arduino")){ - - if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("101")){ - arduino101.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("201")){ - arduino201.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("301")){ - arduino301.setVisibility(View.VISIBLE); - } else if(response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i+1)).getString("zorlukSeviyesi").equals("401")){ - arduino401.setVisibility(View.VISIBLE); + } else if (kategoriString.equals("Arduino")) { + + if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("101")) { + fragmentProfilBinding.imageViewArduino101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("201")) { + fragmentProfilBinding.imageViewArduino101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("301")) { + fragmentProfilBinding.imageViewArduino101ProfilFragment.setVisibility(View.VISIBLE); + } else if (response.getJSONObject("basariBelgeleri").getJSONObject(Integer.toString(i + 1)).getString("zorlukSeviyesi").equals("401")) { + fragmentProfilBinding.imageViewArduino101ProfilFragment.setVisibility(View.VISIBLE); } } - } - - ResimGetir(); - //basari1.setText(response.getJSONObject("basariBelgeleri").getJSONObject("1").getString("title")); - } catch (JSONException e) { e.printStackTrace(); } - } }, new Response.ErrorListener() { @Override @@ -353,18 +288,16 @@ public void onErrorResponse(VolleyError error) { } }); - AppController.getInstance().addToRequestQueue(jsonObjectRequest,"profilTag"); + AppController.getInstance().addToRequestQueue(jsonObjectRequest, "profilTag"); } - public void ResimGetir(){ - + public void ResimGetir() { - //Resmi Alıcaz. - requestImage = new ImageRequest(avatarUrl, new Response.Listener() { + imageRequest = new ImageRequest(avatarUrlString, new Response.Listener() { @Override public void onResponse(Bitmap response) { - avatar.setImageBitmap(response); + avatarImageView.setImageBitmap(response); } }, 0, 0, null, new Response.ErrorListener() { @Override @@ -373,7 +306,7 @@ public void onErrorResponse(VolleyError error) { } }); - AppController.getInstance().addToRequestQueue(requestImage,"profilResimTag"); + AppController.getInstance().addToRequestQueue(imageRequest, "profilResimTag"); } @@ -385,10 +318,10 @@ public void onStop() { } - private void SosyalPlatformAc(String platform,String Url) { + private void SosyalPlatformAc(String platform, String Url) { - if(Url != "null") { + if (Url != "null") { String SosyalUrl = Url; String[] userID = SosyalUrl.split(".com/"); @@ -462,26 +395,26 @@ private void SosyalPlatformAc(String platform,String Url) { } } else { - Toast.makeText(getActivity(), "Kullanicinin "+platform + " hesabi kayitli degil.", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), "Kullanicinin " + platform + " hesabi kayitli degil.", Toast.LENGTH_SHORT).show(); } } @Override public void onClick(View v) { - switch (v.getId()){ - case R.id.fab_face: - SosyalPlatformAc("facebook",facebookUrl); + switch (v.getId()) { + case R.id.floatActionButtonFacebookProfilFragment: + SosyalPlatformAc("facebook", facebookUrlString); break; - case R.id.fab_google: - SosyalPlatformAc("googleplus",googleplusUrl); + case R.id.floatActionButtonGoogleProfilFragment: + SosyalPlatformAc("googleplus", googleplusUrlString); break; - case R.id.fab_linkedin: - SosyalPlatformAc("linkedin",linkedinUrl); + case R.id.floatActionButtonLinkedinProfilFragment: + SosyalPlatformAc("linkedin", linkedinUrlString); break; - case R.id.fab_twitter: - SosyalPlatformAc("twitter",twitterUrl); + case R.id.floatActionButtonTwitterProfilFragment: + SosyalPlatformAc("twitter", twitterUrlString); break; } } diff --git a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/WebFragment.java b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/WebFragment.java index 0926337..4b442b0 100644 --- a/src/main/java/com/turkcell/gelecegiyazanlar/fragments/WebFragment.java +++ b/src/main/java/com/turkcell/gelecegiyazanlar/fragments/WebFragment.java @@ -2,19 +2,21 @@ import android.animation.Animator; import android.content.Intent; +import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v4.content.res.ResourcesCompat; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; -import android.widget.ImageView; import android.widget.LinearLayout; import com.turkcell.gelecegiyazanlar.R; import com.turkcell.gelecegiyazanlar.activities.EgitimBaslikActivity; +import com.turkcell.gelecegiyazanlar.databinding.FragmentWebBinding; import com.turkcell.gelecegiyazanlar.designs.SlidingTabLayoutIcon; import com.turkcell.gelecegiyazanlar.models.Egitim; @@ -24,71 +26,41 @@ public class WebFragment extends Fragment implements View.OnClickListener { + private FragmentWebBinding fragmentWebBinding; - LinearLayout ust_layout, web, webIcerik; - - Toolbar toolbar; - - LinearLayout web101, web101Layout, web201, web201Layout, web301, web301Layout, web302, web302Layout, web401, web401Layout, web402, web402Layout; - - - SlidingTabLayoutIcon tablar; - ImageView webSagOk, web101AsagiOk, web201AsagiOk, web301AsagiOk, web302AsagiOk, web401AsagiOk, web402AsagiOk; + private LinearLayout ustEkranLinearLayout; + private Toolbar toolbar; + private SlidingTabLayoutIcon slidingTabLayoutIcon; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - toolbar = (Toolbar) getActivity().findViewById(R.id.tool_bar); - View rootView = inflater.inflate(R.layout.fragment_web, container, false); - - web = (LinearLayout) rootView.findViewById(R.id.web); - webIcerik = (LinearLayout) rootView.findViewById(R.id.layout_web_icerik); - webSagOk = (ImageView) rootView.findViewById(R.id.websagok); - - web101AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_101_web); - web101 = (LinearLayout) rootView.findViewById(R.id.egitimal_web_101); - web101Layout = (LinearLayout) rootView.findViewById(R.id.layout_web_101); - - web201AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_201_web); - web201 = (LinearLayout) rootView.findViewById(R.id.egitimal_web_201); - web201Layout = (LinearLayout) rootView.findViewById(R.id.layout_web_201); - - web301AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_301_android); - web301 = (LinearLayout) rootView.findViewById(R.id.egitimal_web_301); - web301Layout = (LinearLayout) rootView.findViewById(R.id.layout_web_301); - - web302AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_302_web); - web302 = (LinearLayout) rootView.findViewById(R.id.egitimal_web_302); - web302Layout = (LinearLayout) rootView.findViewById(R.id.layout_web_302); - - web401AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_401_web); - web401 = (LinearLayout) rootView.findViewById(R.id.egitimal_web_401); - web401Layout = (LinearLayout) rootView.findViewById(R.id.layout_web_401); + toolbar = (Toolbar) getActivity().findViewById(R.id.toolbarMainActivity); - web402AsagiOk = (ImageView) rootView.findViewById(R.id.asagi_image_402_web); - web402 = (LinearLayout) rootView.findViewById(R.id.egitimal_web_402); - web402Layout = (LinearLayout) rootView.findViewById(R.id.layout_web_402); + fragmentWebBinding = DataBindingUtil.inflate( + inflater, R.layout.fragment_web, container, false); + View rootView = fragmentWebBinding.getRoot(); - ust_layout = (LinearLayout) getActivity().findViewById(R.id.ustekran); - tablar = (SlidingTabLayoutIcon) getActivity().findViewById(R.id.tabs); + ustEkranLinearLayout = (LinearLayout) getActivity().findViewById(R.id.linearLayoutUstEkranEgitimFragment); + slidingTabLayoutIcon = (SlidingTabLayoutIcon) getActivity().findViewById(R.id.slidingTabLayoutIconEgitimFragment); - web.setOnClickListener(this); - web101Layout.setOnClickListener(this); - web201Layout.setOnClickListener(this); - web301Layout.setOnClickListener(this); - web302Layout.setOnClickListener(this); - web401Layout.setOnClickListener(this); - web402Layout.setOnClickListener(this); + fragmentWebBinding.linearLayotWebWebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutWeb101WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutWeb201WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutWeb301WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutWeb302WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutWeb401WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutWeb402WebFragment.setOnClickListener(this); - web101.setOnClickListener(this); - web201.setOnClickListener(this); - web301.setOnClickListener(this); - web302.setOnClickListener(this); - web401.setOnClickListener(this); - web402.setOnClickListener(this); + fragmentWebBinding.linearLayoutEgitimAlWeb101WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutEgitimAlWeb201WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutEgitimAlWeb301WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutEgitimAlWeb302WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutEgitimAlWeb401WebFragment.setOnClickListener(this); + fragmentWebBinding.linearLayoutEgitimAlWeb402WebFragment.setOnClickListener(this); return rootView; } @@ -99,98 +71,98 @@ public void onClick(View v) { Intent i = null; switch (v.getId()) { - case R.id.web: - if (webIcerik.getVisibility() == View.VISIBLE) { - webIcerik.setVisibility(View.GONE); + case R.id.linearLayotWebWebFragment: + if (fragmentWebBinding.linearLayoutWebIcerikWebFragment.getVisibility() == View.VISIBLE) { + fragmentWebBinding.linearLayoutWebIcerikWebFragment.setVisibility(View.GONE); goster(); - tablar.setVisibility(View.VISIBLE); - webSagOk.setImageDrawable(getResources().getDrawable(R.drawable.sagok)); + slidingTabLayoutIcon.setVisibility(View.VISIBLE); + fragmentWebBinding.imageViewWebSagokWebFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.sagok, null)); } else { - webIcerik.setVisibility(View.VISIBLE); + fragmentWebBinding.linearLayoutWebIcerikWebFragment.setVisibility(View.VISIBLE); sakla(); - tablar.setVisibility(View.GONE); - webSagOk.setImageDrawable(getResources().getDrawable(R.drawable.asagiok)); + slidingTabLayoutIcon.setVisibility(View.GONE); + fragmentWebBinding.imageViewWebSagokWebFragment.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.asagiok, null)); } break; - case R.id.layout_web_101: - if (web101.getVisibility() == View.VISIBLE) { - web101.setVisibility(View.GONE); - web101AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutWeb101WebFragment: + if (fragmentWebBinding.linearLayoutEgitimAlWeb101WebFragment.getVisibility() == View.VISIBLE) { + fragmentWebBinding.linearLayoutEgitimAlWeb101WebFragment.setVisibility(View.GONE); + fragmentWebBinding.imageViewAsagiImage101WebFragment.setImageResource(R.drawable.asagiikon); } else { - web101.setVisibility(View.VISIBLE); - web101AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentWebBinding.linearLayoutEgitimAlWeb101WebFragment.setVisibility(View.VISIBLE); + fragmentWebBinding.imageViewAsagiImage101WebFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_web_201: - if (web201.getVisibility() == View.VISIBLE) { - web201.setVisibility(View.GONE); - web201AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutWeb201WebFragment: + if (fragmentWebBinding.linearLayoutEgitimAlWeb201WebFragment.getVisibility() == View.VISIBLE) { + fragmentWebBinding.linearLayoutEgitimAlWeb201WebFragment.setVisibility(View.GONE); + fragmentWebBinding.imageViewAsagiImage201WebFragment.setImageResource(R.drawable.asagiikon); } else { - web201.setVisibility(View.VISIBLE); - web201AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentWebBinding.linearLayoutEgitimAlWeb201WebFragment.setVisibility(View.VISIBLE); + fragmentWebBinding.imageViewAsagiImage201WebFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_web_301: - if (web301.getVisibility() == View.VISIBLE) { - web301.setVisibility(View.GONE); - web301AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutWeb301WebFragment: + if (fragmentWebBinding.linearLayoutEgitimAlWeb301WebFragment.getVisibility() == View.VISIBLE) { + fragmentWebBinding.linearLayoutEgitimAlWeb301WebFragment.setVisibility(View.GONE); + fragmentWebBinding.imageViewAsagiImage301WebFragment.setImageResource(R.drawable.asagiikon); } else { - web301.setVisibility(View.VISIBLE); - web301AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentWebBinding.linearLayoutEgitimAlWeb301WebFragment.setVisibility(View.VISIBLE); + fragmentWebBinding.imageViewAsagiImage301WebFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_web_302: - if (web302.getVisibility() == View.VISIBLE) { - web302.setVisibility(View.GONE); - web302AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutWeb302WebFragment: + if (fragmentWebBinding.linearLayoutEgitimAlWeb302WebFragment.getVisibility() == View.VISIBLE) { + fragmentWebBinding.linearLayoutEgitimAlWeb302WebFragment.setVisibility(View.GONE); + fragmentWebBinding.imageViewAsagiImage302WebFragment.setImageResource(R.drawable.asagiikon); } else { - web302.setVisibility(View.VISIBLE); - web302AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentWebBinding.linearLayoutEgitimAlWeb302WebFragment.setVisibility(View.VISIBLE); + fragmentWebBinding.imageViewAsagiImage302WebFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_web_401: - if (web401.getVisibility() == View.VISIBLE) { - web401.setVisibility(View.GONE); - web401AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutWeb401WebFragment: + if (fragmentWebBinding.linearLayoutEgitimAlWeb401WebFragment.getVisibility() == View.VISIBLE) { + fragmentWebBinding.linearLayoutEgitimAlWeb401WebFragment.setVisibility(View.GONE); + fragmentWebBinding.imageViewAsagiImage401WebFragment.setImageResource(R.drawable.asagiikon); } else { - web401.setVisibility(View.VISIBLE); - web401AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentWebBinding.linearLayoutEgitimAlWeb401WebFragment.setVisibility(View.VISIBLE); + fragmentWebBinding.imageViewAsagiImage401WebFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.layout_web_402: - if (web402.getVisibility() == View.VISIBLE) { - web402.setVisibility(View.GONE); - web402AsagiOk.setImageResource(R.drawable.asagiikon); + case R.id.linearLayoutWeb402WebFragment: + if (fragmentWebBinding.linearLayoutEgitimAlWeb402WebFragment.getVisibility() == View.VISIBLE) { + fragmentWebBinding.linearLayoutEgitimAlWeb402WebFragment.setVisibility(View.GONE); + fragmentWebBinding.imageViewAsagiImage402WebFragment.setImageResource(R.drawable.asagiikon); } else { - web402.setVisibility(View.VISIBLE); - web402AsagiOk.setImageResource(R.drawable.yukariikon); + fragmentWebBinding.linearLayoutEgitimAlWeb402WebFragment.setVisibility(View.VISIBLE); + fragmentWebBinding.imageViewAsagiImage402WebFragment.setImageResource(R.drawable.yukariikon); } break; - case R.id.egitimal_web_101: + case R.id.linearLayoutEgitimAlWeb101WebFragment: i = new Intent(getActivity(), EgitimBaslikActivity.class); i.putExtra(Egitim.TITLE_TAG, "Web Programlama 101"); i.putExtra(Egitim.COLOR_TAG, "web"); i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.web101)); startActivity(i); break; - case R.id.egitimal_web_201: + case R.id.linearLayoutEgitimAlWeb201WebFragment: i = new Intent(getActivity(), EgitimBaslikActivity.class); i.putExtra(Egitim.TITLE_TAG, "Web Programlama 201"); i.putExtra(Egitim.COLOR_TAG, "web"); i.putExtra(Egitim.NODE_ID, getResources().getString(R.string.web201)); startActivity(i); break; - case R.id.egitimal_web_301: + case R.id.linearLayoutEgitimAlWeb301WebFragment: i = new Intent(getActivity(), EgitimBaslikActivity.class); i.putExtra(Egitim.TITLE_TAG, "Web Programlama 301"); i.putExtra(Egitim.COLOR_TAG, "web"); @@ -198,7 +170,7 @@ public void onClick(View v) { startActivity(i); break; - case R.id.egitimal_web_302: + case R.id.linearLayoutEgitimAlWeb302WebFragment: i = new Intent(getActivity(), EgitimBaslikActivity.class); i.putExtra(Egitim.TITLE_TAG, "Web Programlama 302"); i.putExtra(Egitim.COLOR_TAG, "web"); @@ -206,7 +178,7 @@ public void onClick(View v) { startActivity(i); break; - case R.id.egitimal_web_401: + case R.id.linearLayoutEgitimAlWeb401WebFragment: i = new Intent(getActivity(), EgitimBaslikActivity.class); i.putExtra(Egitim.TITLE_TAG, "Web Programlama 401"); i.putExtra(Egitim.COLOR_TAG, "web"); @@ -214,7 +186,7 @@ public void onClick(View v) { startActivity(i); break; - case R.id.egitimal_web_402: + case R.id.linearLayoutEgitimAlWeb402WebFragment: i = new Intent(getActivity(), EgitimBaslikActivity.class); i.putExtra(Egitim.TITLE_TAG, "Web Programlama 402"); i.putExtra(Egitim.COLOR_TAG, "web"); @@ -227,7 +199,7 @@ public void onClick(View v) { } public void sakla() { - ust_layout.animate().translationY(-ust_layout.getBottom() - toolbar.getBottom()).setInterpolator(new AccelerateInterpolator(2)) + ustEkranLinearLayout.animate().translationY(-ustEkranLinearLayout.getBottom() - toolbar.getBottom()).setInterpolator(new AccelerateInterpolator(2)) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { @@ -236,7 +208,7 @@ public void onAnimationStart(Animator animation) { @Override public void onAnimationEnd(Animator animation) { - ust_layout.setVisibility(View.GONE); + ustEkranLinearLayout.setVisibility(View.GONE); } @Override @@ -252,11 +224,11 @@ public void onAnimationRepeat(Animator animation) { } public void goster() { - ust_layout.animate().translationY(0).setInterpolator(new DecelerateInterpolator(2)) + ustEkranLinearLayout.animate().translationY(0).setInterpolator(new DecelerateInterpolator(2)) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animation) { - ust_layout.setVisibility(View.VISIBLE); + ustEkranLinearLayout.setVisibility(View.VISIBLE); } @Override diff --git a/src/main/res/drawable/androidlogosu.png b/src/main/res/drawable/androidlogosu.png old mode 100644 new mode 100755 index 54f6d11..73445ab Binary files a/src/main/res/drawable/androidlogosu.png and b/src/main/res/drawable/androidlogosu.png differ diff --git a/src/main/res/drawable/apiios.png b/src/main/res/drawable/apiios.png old mode 100644 new mode 100755 index 2ff7f8c..2adf6af Binary files a/src/main/res/drawable/apiios.png and b/src/main/res/drawable/apiios.png differ diff --git a/src/main/res/drawable/apiweb401.png b/src/main/res/drawable/apiweb401.png old mode 100644 new mode 100755 index 6a54165..91c42b6 Binary files a/src/main/res/drawable/apiweb401.png and b/src/main/res/drawable/apiweb401.png differ diff --git a/src/main/res/drawable/apiweb501.png b/src/main/res/drawable/apiweb501.png old mode 100644 new mode 100755 index 3c48236..4541b20 Binary files a/src/main/res/drawable/apiweb501.png and b/src/main/res/drawable/apiweb501.png differ diff --git a/src/main/res/drawable/appinventorlogosu.png b/src/main/res/drawable/appinventorlogosu.png old mode 100644 new mode 100755 index 1d27f50..55abf68 Binary files a/src/main/res/drawable/appinventorlogosu.png and b/src/main/res/drawable/appinventorlogosu.png differ diff --git a/src/main/res/drawable/arama.png b/src/main/res/drawable/arama.png old mode 100644 new mode 100755 index 80d0058..3561939 Binary files a/src/main/res/drawable/arama.png and b/src/main/res/drawable/arama.png differ diff --git a/src/main/res/drawable/arduinologosu.png b/src/main/res/drawable/arduinologosu.png old mode 100644 new mode 100755 index 43c92c1..53aeeba Binary files a/src/main/res/drawable/arduinologosu.png and b/src/main/res/drawable/arduinologosu.png differ diff --git a/src/main/res/drawable/asagiikon.png b/src/main/res/drawable/asagiikon.png old mode 100644 new mode 100755 index 208f6c7..5d19e7e Binary files a/src/main/res/drawable/asagiikon.png and b/src/main/res/drawable/asagiikon.png differ diff --git a/src/main/res/drawable/asagiok.png b/src/main/res/drawable/asagiok.png old mode 100644 new mode 100755 index d534c83..5df385e Binary files a/src/main/res/drawable/asagiok.png and b/src/main/res/drawable/asagiok.png differ diff --git a/src/main/res/drawable/backarrow.png b/src/main/res/drawable/backarrow.png old mode 100644 new mode 100755 index 76fe444..b1abb41 Binary files a/src/main/res/drawable/backarrow.png and b/src/main/res/drawable/backarrow.png differ diff --git a/src/main/res/drawable/blog.png b/src/main/res/drawable/blog.png old mode 100644 new mode 100755 index 409c393..b6f05bb Binary files a/src/main/res/drawable/blog.png and b/src/main/res/drawable/blog.png differ diff --git a/src/main/res/drawable/blogg.jpg b/src/main/res/drawable/blogg.jpg old mode 100644 new mode 100755 index c31aeb0..427aa84 Binary files a/src/main/res/drawable/blogg.jpg and b/src/main/res/drawable/blogg.jpg differ diff --git a/src/main/res/drawable/blogicon.png b/src/main/res/drawable/blogicon.png old mode 100644 new mode 100755 index 67a875e..ddc722f Binary files a/src/main/res/drawable/blogicon.png and b/src/main/res/drawable/blogicon.png differ diff --git a/src/main/res/drawable/bloglogo.png b/src/main/res/drawable/bloglogo.png old mode 100644 new mode 100755 index d10e433..d1dc99f Binary files a/src/main/res/drawable/bloglogo.png and b/src/main/res/drawable/bloglogo.png differ diff --git a/src/main/res/drawable/d101.png b/src/main/res/drawable/d101.png old mode 100644 new mode 100755 index c196151..45ffefa Binary files a/src/main/res/drawable/d101.png and b/src/main/res/drawable/d101.png differ diff --git a/src/main/res/drawable/d101s.png b/src/main/res/drawable/d101s.png old mode 100644 new mode 100755 index d1a827c..a1c21fa Binary files a/src/main/res/drawable/d101s.png and b/src/main/res/drawable/d101s.png differ diff --git a/src/main/res/drawable/d201.png b/src/main/res/drawable/d201.png old mode 100644 new mode 100755 index d4a8b91..0f975bf Binary files a/src/main/res/drawable/d201.png and b/src/main/res/drawable/d201.png differ diff --git a/src/main/res/drawable/d201s.png b/src/main/res/drawable/d201s.png old mode 100644 new mode 100755 index aa8f721..bb658af Binary files a/src/main/res/drawable/d201s.png and b/src/main/res/drawable/d201s.png differ diff --git a/src/main/res/drawable/d301.png b/src/main/res/drawable/d301.png old mode 100644 new mode 100755 index d80a911..6a722bc Binary files a/src/main/res/drawable/d301.png and b/src/main/res/drawable/d301.png differ diff --git a/src/main/res/drawable/d301s.png b/src/main/res/drawable/d301s.png old mode 100644 new mode 100755 index 951e152..2df340e Binary files a/src/main/res/drawable/d301s.png and b/src/main/res/drawable/d301s.png differ diff --git a/src/main/res/drawable/d401.png b/src/main/res/drawable/d401.png old mode 100644 new mode 100755 index d2b54d2..ec5230b Binary files a/src/main/res/drawable/d401.png and b/src/main/res/drawable/d401.png differ diff --git a/src/main/res/drawable/d401s.png b/src/main/res/drawable/d401s.png old mode 100644 new mode 100755 index 82d5a92..c544020 Binary files a/src/main/res/drawable/d401s.png and b/src/main/res/drawable/d401s.png differ diff --git a/src/main/res/drawable/daire.png b/src/main/res/drawable/daire.png old mode 100644 new mode 100755 index 17b7028..3a23914 Binary files a/src/main/res/drawable/daire.png and b/src/main/res/drawable/daire.png differ diff --git a/src/main/res/drawable/defaultimage.png b/src/main/res/drawable/defaultimage.png old mode 100644 new mode 100755 index bc5a309..993d703 Binary files a/src/main/res/drawable/defaultimage.png and b/src/main/res/drawable/defaultimage.png differ diff --git a/src/main/res/drawable/dogukanyildirim2.png b/src/main/res/drawable/dogukanyildirim2.png old mode 100644 new mode 100755 index 054ffe3..320f599 Binary files a/src/main/res/drawable/dogukanyildirim2.png and b/src/main/res/drawable/dogukanyildirim2.png differ diff --git a/src/main/res/drawable/egitimial.png b/src/main/res/drawable/egitimial.png old mode 100644 new mode 100755 index dd33e77..8fb8c4e Binary files a/src/main/res/drawable/egitimial.png and b/src/main/res/drawable/egitimial.png differ diff --git a/src/main/res/drawable/egitimicon.png b/src/main/res/drawable/egitimicon.png old mode 100644 new mode 100755 index 679b62b..b14e373 Binary files a/src/main/res/drawable/egitimicon.png and b/src/main/res/drawable/egitimicon.png differ diff --git a/src/main/res/drawable/egitimkep.png b/src/main/res/drawable/egitimkep.png old mode 100644 new mode 100755 index e2b68b4..83c7fb0 Binary files a/src/main/res/drawable/egitimkep.png and b/src/main/res/drawable/egitimkep.png differ diff --git a/src/main/res/drawable/elciicon.png b/src/main/res/drawable/elciicon.png old mode 100644 new mode 100755 index b36a540..a7f6124 Binary files a/src/main/res/drawable/elciicon.png and b/src/main/res/drawable/elciicon.png differ diff --git a/src/main/res/drawable/etkinlik_gun.png b/src/main/res/drawable/etkinlik_gun.png old mode 100644 new mode 100755 index a08fb37..e20c615 Binary files a/src/main/res/drawable/etkinlik_gun.png and b/src/main/res/drawable/etkinlik_gun.png differ diff --git a/src/main/res/drawable/etkinlikicon.png b/src/main/res/drawable/etkinlikicon.png old mode 100644 new mode 100755 index da80c4f..02359b1 Binary files a/src/main/res/drawable/etkinlikicon.png and b/src/main/res/drawable/etkinlikicon.png differ diff --git a/src/main/res/drawable/etkinliklogosu.png b/src/main/res/drawable/etkinliklogosu.png old mode 100644 new mode 100755 index 07fa630..09095bd Binary files a/src/main/res/drawable/etkinliklogosu.png and b/src/main/res/drawable/etkinliklogosu.png differ diff --git a/src/main/res/drawable/face_icon.png b/src/main/res/drawable/face_icon.png old mode 100644 new mode 100755 index 4b3cf6f..d05e458 Binary files a/src/main/res/drawable/face_icon.png and b/src/main/res/drawable/face_icon.png differ diff --git a/src/main/res/drawable/feyza.png b/src/main/res/drawable/feyza.png old mode 100644 new mode 100755 index 4734568..b5488b2 Binary files a/src/main/res/drawable/feyza.png and b/src/main/res/drawable/feyza.png differ diff --git a/src/main/res/drawable/gelistiriciicon.png b/src/main/res/drawable/gelistiriciicon.png old mode 100644 new mode 100755 index 2c2392e..5475467 Binary files a/src/main/res/drawable/gelistiriciicon.png and b/src/main/res/drawable/gelistiriciicon.png differ diff --git a/src/main/res/drawable/gizemnuryurdagul.png b/src/main/res/drawable/gizemnuryurdagul.png old mode 100644 new mode 100755 index fe82ee2..f43a24d Binary files a/src/main/res/drawable/gizemnuryurdagul.png and b/src/main/res/drawable/gizemnuryurdagul.png differ diff --git a/src/main/res/drawable/googleplus.png b/src/main/res/drawable/googleplus.png old mode 100644 new mode 100755 index 3c1d5b5..fa46fe2 Binary files a/src/main/res/drawable/googleplus.png and b/src/main/res/drawable/googleplus.png differ diff --git a/src/main/res/drawable/haciabdullah.png b/src/main/res/drawable/haciabdullah.png old mode 100644 new mode 100755 index 4107d3f..79bb0d8 Binary files a/src/main/res/drawable/haciabdullah.png and b/src/main/res/drawable/haciabdullah.png differ diff --git a/src/main/res/drawable/iletisimicon.png b/src/main/res/drawable/iletisimicon.png old mode 100644 new mode 100755 index 1f3e2f8..0707b24 Binary files a/src/main/res/drawable/iletisimicon.png and b/src/main/res/drawable/iletisimicon.png differ diff --git a/src/main/res/drawable/ioslogosu.png b/src/main/res/drawable/ioslogosu.png old mode 100644 new mode 100755 index ec5c405..ecd168c Binary files a/src/main/res/drawable/ioslogosu.png and b/src/main/res/drawable/ioslogosu.png differ diff --git a/src/main/res/drawable/kadirhan.png b/src/main/res/drawable/kadirhan.png old mode 100644 new mode 100755 index 2f1d6f3..3873bc1 Binary files a/src/main/res/drawable/kadirhan.png and b/src/main/res/drawable/kadirhan.png differ diff --git a/src/main/res/drawable/kepikon.png b/src/main/res/drawable/kepikon.png old mode 100644 new mode 100755 index 016f903..52387d6 Binary files a/src/main/res/drawable/kepikon.png and b/src/main/res/drawable/kepikon.png differ diff --git a/src/main/res/drawable/kirmizidaire.png b/src/main/res/drawable/kirmizidaire.png old mode 100644 new mode 100755 index 2bdcf7f..e3b69f8 Binary files a/src/main/res/drawable/kirmizidaire.png and b/src/main/res/drawable/kirmizidaire.png differ diff --git a/src/main/res/drawable/konum.png b/src/main/res/drawable/konum.png old mode 100644 new mode 100755 index c0c9169..1c3c715 Binary files a/src/main/res/drawable/konum.png and b/src/main/res/drawable/konum.png differ diff --git a/src/main/res/drawable/left_back.png b/src/main/res/drawable/left_back.png old mode 100644 new mode 100755 index 007403d..fb2ac83 Binary files a/src/main/res/drawable/left_back.png and b/src/main/res/drawable/left_back.png differ diff --git a/src/main/res/drawable/linkedin.png b/src/main/res/drawable/linkedin.png old mode 100644 new mode 100755 index b84129a..22227dc Binary files a/src/main/res/drawable/linkedin.png and b/src/main/res/drawable/linkedin.png differ diff --git a/src/main/res/drawable/mobil_gri.png b/src/main/res/drawable/mobil_gri.png old mode 100644 new mode 100755 index f95ee81..dd8bfef Binary files a/src/main/res/drawable/mobil_gri.png and b/src/main/res/drawable/mobil_gri.png differ diff --git a/src/main/res/drawable/mobil_ust_logo.png b/src/main/res/drawable/mobil_ust_logo.png old mode 100644 new mode 100755 index dc4d4ed..5bbf04a Binary files a/src/main/res/drawable/mobil_ust_logo.png and b/src/main/res/drawable/mobil_ust_logo.png differ diff --git a/src/main/res/drawable/orneketkinlik.png b/src/main/res/drawable/orneketkinlik.png old mode 100644 new mode 100755 index 1a2a159..7563976 Binary files a/src/main/res/drawable/orneketkinlik.png and b/src/main/res/drawable/orneketkinlik.png differ diff --git a/src/main/res/drawable/oyun_gri.png b/src/main/res/drawable/oyun_gri.png old mode 100644 new mode 100755 index cdf3d5e..6502457 Binary files a/src/main/res/drawable/oyun_gri.png and b/src/main/res/drawable/oyun_gri.png differ diff --git a/src/main/res/drawable/oyun_ust_logo.png b/src/main/res/drawable/oyun_ust_logo.png old mode 100644 new mode 100755 index 9960dff..c279847 Binary files a/src/main/res/drawable/oyun_ust_logo.png and b/src/main/res/drawable/oyun_ust_logo.png differ diff --git a/src/main/res/drawable/oyungelistirmeikon.png b/src/main/res/drawable/oyungelistirmeikon.png old mode 100644 new mode 100755 index 8a18a0a..a592f94 Binary files a/src/main/res/drawable/oyungelistirmeikon.png and b/src/main/res/drawable/oyungelistirmeikon.png differ diff --git a/src/main/res/drawable/pro.jpg b/src/main/res/drawable/pro.jpg old mode 100644 new mode 100755 index 7a7b421..51a5d4e Binary files a/src/main/res/drawable/pro.jpg and b/src/main/res/drawable/pro.jpg differ diff --git a/src/main/res/drawable/resim_default.png b/src/main/res/drawable/resim_default.png old mode 100644 new mode 100755 index 1f84db4..18d9c7f Binary files a/src/main/res/drawable/resim_default.png and b/src/main/res/drawable/resim_default.png differ diff --git a/src/main/res/drawable/sagok.png b/src/main/res/drawable/sagok.png old mode 100644 new mode 100755 index e773d9e..9c1f944 Binary files a/src/main/res/drawable/sagok.png and b/src/main/res/drawable/sagok.png differ diff --git a/src/main/res/drawable/saridaire.png b/src/main/res/drawable/saridaire.png old mode 100644 new mode 100755 index 24b96be..f94bfb0 Binary files a/src/main/res/drawable/saridaire.png and b/src/main/res/drawable/saridaire.png differ diff --git a/src/main/res/drawable/scratchlogosu.png b/src/main/res/drawable/scratchlogosu.png old mode 100644 new mode 100755 index 9ad0c2b..11e5634 Binary files a/src/main/res/drawable/scratchlogosu.png and b/src/main/res/drawable/scratchlogosu.png differ diff --git a/src/main/res/drawable/searchicon.png b/src/main/res/drawable/searchicon.png old mode 100644 new mode 100755 index abbb989..ebfbdf2 Binary files a/src/main/res/drawable/searchicon.png and b/src/main/res/drawable/searchicon.png differ diff --git a/src/main/res/drawable/tanerutku.png b/src/main/res/drawable/tanerutku.png old mode 100644 new mode 100755 index 4d1a027..87363a0 Binary files a/src/main/res/drawable/tanerutku.png and b/src/main/res/drawable/tanerutku.png differ diff --git a/src/main/res/drawable/turuncudaire.png b/src/main/res/drawable/turuncudaire.png old mode 100644 new mode 100755 index 978b90b..6fd79ca Binary files a/src/main/res/drawable/turuncudaire.png and b/src/main/res/drawable/turuncudaire.png differ diff --git a/src/main/res/drawable/twitter_icon.png b/src/main/res/drawable/twitter_icon.png old mode 100644 new mode 100755 index f65a772..4e20f2c Binary files a/src/main/res/drawable/twitter_icon.png and b/src/main/res/drawable/twitter_icon.png differ diff --git a/src/main/res/drawable/volkankilic.png b/src/main/res/drawable/volkankilic.png old mode 100644 new mode 100755 index 0875610..21d4495 Binary files a/src/main/res/drawable/volkankilic.png and b/src/main/res/drawable/volkankilic.png differ diff --git a/src/main/res/drawable/web_gri.png b/src/main/res/drawable/web_gri.png old mode 100644 new mode 100755 index 4cf2605..b3c3b52 Binary files a/src/main/res/drawable/web_gri.png and b/src/main/res/drawable/web_gri.png differ diff --git a/src/main/res/drawable/web_ust_logo.png b/src/main/res/drawable/web_ust_logo.png old mode 100644 new mode 100755 index 7f0d021..7952807 Binary files a/src/main/res/drawable/web_ust_logo.png and b/src/main/res/drawable/web_ust_logo.png differ diff --git a/src/main/res/drawable/webblog.png b/src/main/res/drawable/webblog.png old mode 100644 new mode 100755 index 3ce0240..0bcf1d6 Binary files a/src/main/res/drawable/webblog.png and b/src/main/res/drawable/webblog.png differ diff --git a/src/main/res/drawable/webprogramlamaicon.png b/src/main/res/drawable/webprogramlamaicon.png old mode 100644 new mode 100755 index b46ba5b..847f59b Binary files a/src/main/res/drawable/webprogramlamaicon.png and b/src/main/res/drawable/webprogramlamaicon.png differ diff --git a/src/main/res/drawable/windowsphonelogosu.png b/src/main/res/drawable/windowsphonelogosu.png old mode 100644 new mode 100755 index 85ba757..6a4b011 Binary files a/src/main/res/drawable/windowsphonelogosu.png and b/src/main/res/drawable/windowsphonelogosu.png differ diff --git a/src/main/res/drawable/yesildaire.png b/src/main/res/drawable/yesildaire.png old mode 100644 new mode 100755 index fe2ab85..97c00a1 Binary files a/src/main/res/drawable/yesildaire.png and b/src/main/res/drawable/yesildaire.png differ diff --git a/src/main/res/drawable/youtube_icon.png b/src/main/res/drawable/youtube_icon.png old mode 100644 new mode 100755 index b38ca69..71e0d44 Binary files a/src/main/res/drawable/youtube_icon.png and b/src/main/res/drawable/youtube_icon.png differ diff --git a/src/main/res/drawable/yukariikon.png b/src/main/res/drawable/yukariikon.png old mode 100644 new mode 100755 index aff30e9..435ad1c Binary files a/src/main/res/drawable/yukariikon.png and b/src/main/res/drawable/yukariikon.png differ diff --git a/src/main/res/drawable/yusuferenutku.png b/src/main/res/drawable/yusuferenutku.png old mode 100644 new mode 100755 index 9adeccb..1e0ec5e Binary files a/src/main/res/drawable/yusuferenutku.png and b/src/main/res/drawable/yusuferenutku.png differ diff --git a/src/main/res/layout/activity_arama.xml b/src/main/res/layout/activity_arama.xml index 2a3e1fa..da0463b 100644 --- a/src/main/res/layout/activity_arama.xml +++ b/src/main/res/layout/activity_arama.xml @@ -1,41 +1,42 @@ - + + - + android:layout_height="match_parent" + android:background="@color/beyaz_renk" + android:orientation="vertical" + tools:context="com.turkcell.gelecegiyazanlar.activities.AramaActivity"> - + + - + - - + + + + \ No newline at end of file diff --git a/src/main/res/layout/activity_blog_icerik_acitivity.xml b/src/main/res/layout/activity_blog_icerik_acitivity.xml index 2de488c..5a74748 100644 --- a/src/main/res/layout/activity_blog_icerik_acitivity.xml +++ b/src/main/res/layout/activity_blog_icerik_acitivity.xml @@ -1,93 +1,83 @@ - + + - - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + + + + + + + + /> + + android:visibility="gone" /> - - - /> - - /> + + - - - - - + - - /> + - - - - - + diff --git a/src/main/res/layout/activity_egitim_baslik.xml b/src/main/res/layout/activity_egitim_baslik.xml index f885f30..29fead6 100644 --- a/src/main/res/layout/activity_egitim_baslik.xml +++ b/src/main/res/layout/activity_egitim_baslik.xml @@ -1,25 +1,31 @@ - - + + - - + + + + + android:layout_below="@id/toolbarEgitimBaslikActivity" + android:fillViewport="true"> + + - + - + + diff --git a/src/main/res/layout/activity_egitim_icerik.xml b/src/main/res/layout/activity_egitim_icerik.xml index 3b3100c..3e505f7 100644 --- a/src/main/res/layout/activity_egitim_icerik.xml +++ b/src/main/res/layout/activity_egitim_icerik.xml @@ -1,52 +1,54 @@ - - - + + + - - - - - - - + android:orientation="vertical" + tools:context="com.turkcell.gelecegiyazanlar.activities.EgitimIcerikActivity"> + + + + + + + + + + - + + + \ No newline at end of file diff --git a/src/main/res/layout/activity_etkinlik_icerik.xml b/src/main/res/layout/activity_etkinlik_icerik.xml index e5557d7..ddd7d45 100644 --- a/src/main/res/layout/activity_etkinlik_icerik.xml +++ b/src/main/res/layout/activity_etkinlik_icerik.xml @@ -1,51 +1,53 @@ - + + - - - - + android:layout_height="match_parent" + android:orientation="vertical"> - - - + - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_main.xml index 3544f28..6fb23b4 100644 --- a/src/main/res/layout/activity_main.xml +++ b/src/main/res/layout/activity_main.xml @@ -1,50 +1,51 @@ - - - - + + - + android:layout_height="match_parent" + android:animateLayoutChanges="true" + android:orientation="vertical" + tools:context=".MainActivity"> - + - - - - + tools:layout="@layout/fragment_egitim" /> - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/activity_profil.xml b/src/main/res/layout/activity_profil.xml index 0baaa64..cb916a9 100644 --- a/src/main/res/layout/activity_profil.xml +++ b/src/main/res/layout/activity_profil.xml @@ -1,124 +1,122 @@ - - - + + + + android:layout_height="match_parent" + android:background="@color/beyaz_renk" + android:orientation="vertical" + tools:context=".MainActivity"> + + - - - - - - + android:background="@color/beyaz_renk" /> + android:orientation="vertical"> + + - - - + android:textSize="25sp" /> - - - + android:gravity="center" + android:orientation="horizontal"> + + + + + + + + + + + - + + + - + - - - - - - - + \ No newline at end of file diff --git a/src/main/res/layout/activity_yorum.xml b/src/main/res/layout/activity_yorum.xml index 99198b0..9e6289d 100644 --- a/src/main/res/layout/activity_yorum.xml +++ b/src/main/res/layout/activity_yorum.xml @@ -1,33 +1,32 @@ + + - + - + - + - - - + + \ No newline at end of file diff --git a/src/main/res/layout/arama_satir_layout.xml b/src/main/res/layout/arama_satir_layout.xml index 0582b0a..6e3a802 100644 --- a/src/main/res/layout/arama_satir_layout.xml +++ b/src/main/res/layout/arama_satir_layout.xml @@ -2,10 +2,10 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" -android:orientation="horizontal" + android:background="@color/beyaz_renk" + android:orientation="horizontal" android:paddingBottom="@dimen/sol_margin_olcu_onbes" - android:paddingTop="@dimen/sol_margin_olcu_onbes" - android:background="@color/beyaz_renk"> + android:paddingTop="@dimen/sol_margin_olcu_onbes"> - - - - - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/sol_margin_olcu_onbes" - android:textStyle="bold" - android:text="@string/isim" - /> + - + - - - - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/sol_margin_olcu_onbes" - android:textStyle="bold" - android:text="@string/kullanici_adi" - /> - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/aramabar.xml b/src/main/res/layout/aramabar.xml index d55598e..1b9a554 100644 --- a/src/main/res/layout/aramabar.xml +++ b/src/main/res/layout/aramabar.xml @@ -1,36 +1,36 @@ - + android:gravity="center_vertical" + android:theme="@style/Base.ThemeOverlay.AppCompat.Dark"> - - + android:layout_height="match_parent" + android:orientation="horizontal"> + + - + - + \ No newline at end of file diff --git a/src/main/res/layout/card_item_blog.xml b/src/main/res/layout/card_item_blog.xml index b69fe30..7819888 100644 --- a/src/main/res/layout/card_item_blog.xml +++ b/src/main/res/layout/card_item_blog.xml @@ -7,98 +7,95 @@ android:layout_margin="8dp" card_view:cardCornerRadius="4dp"> - - + + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" /> + android:layout_margin="5dp" + android:orientation="vertical"> + android:orientation="horizontal"> - + app:border_color="@color/card_blog_border_renk" + app:border_width="1dp" /> + android:layout_height="wrap_content" + android:orientation="vertical"> + android:paddingTop="10dp"> + + android:textSize="15dp" + android:textStyle="bold" /> + android:textSize="11dp" /> + android:background="@color/blog_item_arkaplan_renk" + android:orientation="vertical" /> @@ -110,47 +107,47 @@ android:orientation="horizontal"> + android:layout_centerVertical="true" + android:scaleType="fitXY" /> + android:orientation="vertical"> + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:layout_weight="0.22" + android:paddingLeft="5dp" + android:text="" + android:textColor="@color/card_blog_yazi_renk" + android:textSize="18sp" /> + android:layout_centerVertical="true" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:paddingLeft="5dp" + android:text="" + android:textColor="@color/blog_item_ozet_renk" + android:textSize="13sp" /> diff --git a/src/main/res/layout/card_item_etkinlik.xml b/src/main/res/layout/card_item_etkinlik.xml index 492be55..cc8a7d8 100644 --- a/src/main/res/layout/card_item_etkinlik.xml +++ b/src/main/res/layout/card_item_etkinlik.xml @@ -8,7 +8,6 @@ card_view:cardCornerRadius="4dp"> - + - - - - /> - - /> + + /> + + - + + + + + android:padding="@dimen/sol_margin_olcu_on"> + + + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="3dp"> + android:layout_marginLeft="@dimen/sol_margin_olcu_onbes" + android:src="@mipmap/ic_launcher" /> + android:textColor="@color/sol_menu_siyah_renk" + android:textSize="@dimen/text_size_onyedi" /> \ No newline at end of file diff --git a/src/main/res/layout/fragment_arama.xml b/src/main/res/layout/fragment_arama.xml index 1064ac4..8e0e900 100644 --- a/src/main/res/layout/fragment_arama.xml +++ b/src/main/res/layout/fragment_arama.xml @@ -1,25 +1,27 @@ - + + - - + android:background="@color/profil_arkaplan_renk" + tools:context="com.turkcell.gelecegiyazanlar.fragments.AramaFragment"> + - + + + + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_blog.xml b/src/main/res/layout/fragment_blog.xml index c1500a9..ef6722b 100644 --- a/src/main/res/layout/fragment_blog.xml +++ b/src/main/res/layout/fragment_blog.xml @@ -1,50 +1,54 @@ - - - - - - + + + + + + android:orientation="vertical"> - + + - + + - + + + + + - - + + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_blog_liste.xml b/src/main/res/layout/fragment_blog_liste.xml index 5a8687a..26be671 100644 --- a/src/main/res/layout/fragment_blog_liste.xml +++ b/src/main/res/layout/fragment_blog_liste.xml @@ -1,20 +1,22 @@ - + + - - - - + + + - > + - - + + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_egitim.xml b/src/main/res/layout/fragment_egitim.xml index a4ddb48..57c4fb2 100644 --- a/src/main/res/layout/fragment_egitim.xml +++ b/src/main/res/layout/fragment_egitim.xml @@ -1,57 +1,58 @@ - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_etkinlik.xml b/src/main/res/layout/fragment_etkinlik.xml index ae9dff0..d9b2046 100644 --- a/src/main/res/layout/fragment_etkinlik.xml +++ b/src/main/res/layout/fragment_etkinlik.xml @@ -1,45 +1,47 @@ - - - + + + + - - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> - + + - - android:id="@+id/recyclerView" - android:layout_width="match_parent" - android:layout_height="match_parent" + - > + - - + + + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_gelistiriciler.xml b/src/main/res/layout/fragment_gelistiriciler.xml index 1f63f22..bb772fe 100644 --- a/src/main/res/layout/fragment_gelistiriciler.xml +++ b/src/main/res/layout/fragment_gelistiriciler.xml @@ -1,458 +1,405 @@ - + + - - + tools:context="com.turkcell.gelecegiyazanlar.fragments.ElcilerFragment"> - - - - + + + + - - - - + android:fadeScrollbars="true"> + + + + + + - - - /> + - + + + - - - - - - - + + + - > - + - + android:gravity="center_horizontal" + android:orientation="vertical"> + + + + + + - - - - - - - - - > - + - > - + - - /> - - + - - + - - - - > - + - /> + - > - + - - /> + - + - + /> - - - + + - /> + - > - + - - - - - - - + android:gravity="center_horizontal" + android:orientation="vertical"> + + - + - > - + - /> + - > - + - + android:gravity="center_horizontal" + android:orientation="vertical"> + + + + + + - - - + - - - + - > - + - + android:gravity="center_horizontal" + android:orientation="vertical"> + + + + + + - - - + - - - + - > - + - + android:gravity="center_horizontal" + android:orientation="vertical"> + + + + + + + - - + - + + - - - - + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_mobil.xml b/src/main/res/layout/fragment_mobil.xml index 76e8b45..1e83b3c 100644 --- a/src/main/res/layout/fragment_mobil.xml +++ b/src/main/res/layout/fragment_mobil.xml @@ -1,99 +1,53 @@ - - - - - - - + + + + + - - - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> - - - + - + - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + android:orientation="horizontal"> + + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:src="@drawable/androidlogosu" /> + android:text="@string/android" + android:textColor="@color/android_yesil_renk" /> + - + android:src="@drawable/sagok" /> + - + - + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - > + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:src="@drawable/ioslogosu" /> + + android:text="@string/ios" + android:textColor="@color/ios_siyah_renk" /> - + android:src="@drawable/sagok" /> + - + - + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:src="@drawable/windowsphonelogosu" /> + android:text="@string/windows" + android:textColor="@color/windows_mavi_renk" /> - + android:src="@drawable/sagok" /> - - + - + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:src="@drawable/scratchlogosu" /> + android:text="@string/scratch" + android:textColor="@color/scratch_turuncu_renk" /> - + android:src="@drawable/sagok" /> - + - + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal"> - - + + + + + + + + + + + + + + + + + - + + - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:src="@drawable/appinventorlogosu" /> + + android:text="@string/appinventor" + android:textColor="@color/app_inventor_kirmizi_renk" /> + + - + android:src="@drawable/sagok" /> - - + + - + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal"> - - + + + + + + + + + + + + + + + + + + + + + + + - + > - + + + + + + + + + + + + + + + + - + + + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - + > + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/turuncudaire" /> + + + + + + + + + + + + + + + + - - + android:id="@+id/imageViewEgitimialAppinventor301BtnMobilFragment" + android:layout_width="@dimen/yuzlukOlcu" + android:layout_height="@dimen/yuzlukOlcu" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-15dp" + android:src="@drawable/egitimial" /> + + + + + - + > - + + + + + + + + + + + + + + + android:layout_marginLeft="@dimen/ellilikOlcu" + android:layout_marginTop="@dimen/margin_bes" + android:orientation="vertical" + android:visibility="gone"> + + + + + - - + + + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:src="@drawable/arduinologosu" /> + android:text="@string/arduino" + android:textColor="@color/arduino_renk" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:src="@drawable/sagok" /> - - + - - - - - - - - - - + android:visibility="gone"> - + - - + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal"> + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/yesildaire" /> + + + + + + + + + + + + + + + + - + android:id="@+id/imageViewEgitimialArduino101BtnMobilFragment" + android:layout_width="@dimen/yuzlukOlcu" + android:layout_height="@dimen/yuzlukOlcu" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-15dp" + android:src="@drawable/egitimial" /> + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - - - + > - - - - - - - + + + + + + + + + + + + - - - - - + android:layout_marginLeft="@dimen/ellilikOlcu" + android:layout_marginTop="@dimen/margin_bes" + android:orientation="vertical" + android:visibility="gone"> + + + + - - + - + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - - + > - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/ellilikOlcu" + android:layout_marginTop="@dimen/margin_bes" + android:orientation="vertical" + android:visibility="gone"> + + - - - - - - + + + + + - - - - - - - - - - + > - + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/kirmizidaire" /> + + + + + + + + + + + + + + + + - - + android:id="@+id/imageViewEgitimialArduino401BtnMobilFragment" + android:layout_width="@dimen/yuzlukOlcu" + android:layout_height="@dimen/yuzlukOlcu" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-15dp" + android:src="@drawable/egitimial" /> + - - - - - + + - - - - - - + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_oyun.xml b/src/main/res/layout/fragment_oyun.xml index 745edb3..20c9568 100644 --- a/src/main/res/layout/fragment_oyun.xml +++ b/src/main/res/layout/fragment_oyun.xml @@ -1,241 +1,241 @@ - - - - - - - + + + + + - - + android:layout_height="wrap_content" + android:orientation="vertical"> - - - - - + - - - - - - + - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + android:orientation="horizontal"> + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:src="@drawable/oyungelistirmeikon" /> + android:layout_gravity="center_vertical" + android:layout_marginLeft="@dimen/margin_bes" + android:text="@string/oyun" + android:textColor="@color/oyun_renk" /> + - + android:id="@+id/imageViewOyunsagokOyunFragment" + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:layout_alignParentRight="true" + android:src="@drawable/sagok" /> + - + - + android:visibility="visible"> - - - - - - - - + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal"> - + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/yesildaire" /> + + + + + + + + + + + + + + + + - - - - - - + + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - - + > + + + + + + + + + + + + + + + + + + + + + - - - - - + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_profil.xml b/src/main/res/layout/fragment_profil.xml index c889ccd..f600f7b 100644 --- a/src/main/res/layout/fragment_profil.xml +++ b/src/main/res/layout/fragment_profil.xml @@ -1,809 +1,793 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + tools:context="com.example.utku.gyprofil.Profil"> - + - - + - + + + - - - - - - - + android:layout_marginTop="10dp" + android:orientation="horizontal"> - - - - - - - + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginLeft="25dp" + android:background="@drawable/daire" /> - - - - - - - - - - - - - - - - + android:layout_height="320dp"> - + + android:id="@+id/textViewHakkindaProfilFragment" + style="@style/mobilIcerikBaslik" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="5dp" + android:textSize="17sp" /> - - - + + + - + + + - + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + - - - - - - - - + android:layout_gravity="left|bottom" + fab:fab_addButtonColorNormal="@color/tab_default_renk" + fab:fab_addButtonColorPressed="@color/fab_pressed_renk" + fab:fab_addButtonPlusIconColor="@color/beyaz_renk" + fab:fab_addButtonStrokeVisible="false" + fab:fab_labelStyle="@style/menu_labels_style" + fab:fab_labelsPosition="left"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_web.xml b/src/main/res/layout/fragment_web.xml index 4baa39b..bdf88b8 100644 --- a/src/main/res/layout/fragment_web.xml +++ b/src/main/res/layout/fragment_web.xml @@ -1,97 +1,52 @@ - - - - - - - + + + + + - - - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> - - - + - + - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + android:orientation="horizontal"> + + android:layout_width="@dimen/ellilikOlcu" + android:layout_height="@dimen/ellilikOlcu" + android:src="@drawable/webprogramlamaicon" /> + android:text="@string/web" + android:textColor="@color/web_renk" /> + - + android:src="@drawable/asagiok" /> + - + - - - - - - - - + android:visibility="visible"> - + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal"> - + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/yesildaire" /> + + + + + + + + + + + + + + + + - - - - - - + + + + - - - - - - - + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - + > - + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/saridaire" /> + + + + + + + + + + + + + + + - - - - - - - + + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - - - - - - - > - - - - - + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/turuncudaire" /> + + + + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - - - + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - + > - + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/kirmizidaire" /> + + + + + + + + + + + + + + + + - - - - - - - + + + + - - - + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - - + > - + + + + + + + + + + + + + + + + + - + + + + + android:layout_marginTop="@dimen/sol_margin_olcu_onbes" + android:orientation="horizontal" - + > + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:src="@drawable/apiweb501" /> + + + + + + + + + + + + + + + - + android:id="@+id/imageViewEgitimAlWeb402BtnWebFragment" + android:layout_width="@dimen/yuzlukOlcu" + android:layout_height="@dimen/yuzlukOlcu" + android:layout_gravity="center_horizontal" + android:layout_marginTop="-15dp" + android:src="@drawable/egitimial" /> + - - - - - - - + + - - - - - + + \ No newline at end of file diff --git a/src/main/res/layout/icerik_arama_satir.xml b/src/main/res/layout/icerik_arama_satir.xml index fc22c5c..224b3f7 100644 --- a/src/main/res/layout/icerik_arama_satir.xml +++ b/src/main/res/layout/icerik_arama_satir.xml @@ -2,63 +2,61 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/beyaz_renk" android:orientation="horizontal" android:paddingBottom="@dimen/sol_margin_olcu_onbes" - android:paddingTop="@dimen/sol_margin_olcu_onbes" - android:background="@color/beyaz_renk"> + android:paddingTop="@dimen/sol_margin_olcu_onbes"> + android:layout_gravity="center_vertical" + android:orientation="vertical"> + + + android:textStyle="bold" /> + android:text="" /> + + android:layout_marginTop="10dp" + android:orientation="horizontal"> + + android:textStyle="bold" /> + + android:text="" /> - - - \ No newline at end of file diff --git a/src/main/res/layout/kategori_child_item.xml b/src/main/res/layout/kategori_child_item.xml index 2f4dca5..0d395df 100644 --- a/src/main/res/layout/kategori_child_item.xml +++ b/src/main/res/layout/kategori_child_item.xml @@ -6,12 +6,13 @@ android:clickable="true" android:orientation="vertical" android:paddingLeft="40dp" - tools:context=".MainActivity" > + tools:context=".MainActivity"> + + android:visibility="gone" /> + android:visibility="gone" /> \ No newline at end of file diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml index f73a6f9..1e18cde 100644 --- a/src/main/res/layout/toolbar.xml +++ b/src/main/res/layout/toolbar.xml @@ -1,21 +1,19 @@ - + android:theme="@style/Base.ThemeOverlay.AppCompat.Dark"> + android:textColor="@color/beyaz_renk" + android:textSize="@dimen/text_size_yirmibes" /> \ No newline at end of file diff --git a/src/main/res/layout/yorum_satir_tasarim.xml b/src/main/res/layout/yorum_satir_tasarim.xml index 4d0a583..e81acb8 100644 --- a/src/main/res/layout/yorum_satir_tasarim.xml +++ b/src/main/res/layout/yorum_satir_tasarim.xml @@ -3,58 +3,53 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal" - android:paddingTop="3dp" - > + android:paddingTop="3dp"> + android:layout_width="70dp" + android:layout_height="70dp"> - + android:layout_centerVertical="true" + app:border_color="@color/yorum_renk" + app:border_width="2dp" /> + android:layout_alignParentTop="true" + android:textSize="10dp" /> + android:textColor="@color/yorum_renk" + android:textSize="15dp" /> + android:layout_toEndOf="@+id/avatar_layout" + android:layout_toRightOf="@+id/avatar_layout" /> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index d86fda2..12e407b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -18,6 +18,7 @@ id Lütfen Internet Bağlantınızı Kontrol Ediniz. Tamam + Ara.. 81